diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:34:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 23:34:49 +0300 |
| commit | e69bbe75de8ee0e732b8c009197f1a97e804d43c (patch) | |
| tree | 9cf8530361e909b5c246dd7e65eb101cfce823ab /include | |
| parent | 85724edecbdc19f53ed4b902fc3a32e4d1b61c9b (diff) | |
| parent | 63ccc191649eb0f14a761074291551d0d2f85389 (diff) | |
| download | linux-e69bbe75de8ee0e732b8c009197f1a97e804d43c.tar.xz | |
Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata updates from Tejun Heo:
"The biggest core change is removal of SCT WRITE SAME support, which
never worked properly.
Other than that, trivial updates in core code and specific embedded
driver updates"
* 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
libata: remove SCT WRITE SAME support
libata: reject passthrough WRITE SAME requests
dt-bindings: ata: add DT bindings for ahci-dm816 SATA controller
ata: ahci: add support for DaVinci DM816 SATA controller
pata: remove the at91 driver
libata: make ata_sg_clean static over again
libata: use setup_deferrable_timer
ata: allow subsystem to be used on m32r and s390 archs
Delete redundant return value check of platform_get_resource()
ata: constify of_device_id structures
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ata.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index af6859b3a93d..ad7d9ee89ff0 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -817,11 +817,6 @@ static inline bool ata_id_sct_error_recovery_ctrl(const u16 *id) return id[ATA_ID_SCT_CMD_XPORT] & (1 << 3) ? true : false; } -static inline bool ata_id_sct_write_same(const u16 *id) -{ - return id[ATA_ID_SCT_CMD_XPORT] & (1 << 2) ? true : false; -} - static inline bool ata_id_sct_long_sector_access(const u16 *id) { return id[ATA_ID_SCT_CMD_XPORT] & (1 << 1) ? true : false; |