aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2015-08-22 15:30:23 -0400
committerSasha Levin <sasha.levin@oracle.com>2015-08-27 13:26:07 -0400
commit514f0a944c001cdad24dce56757bfc3bb991c925 (patch)
treefab000b94e164ec74cf2b62c2892063e76342d5d
parentccdf38d8643e69532044d3a5672d8dc8ebf7a1ab (diff)
downloadlinux-linaro-stable-514f0a944c001cdad24dce56757bfc3bb991c925.tar.gz
Revert "libata: add ATA_HORKAGE_NOTRIM"
This reverts commit e7a84605061b205350654641d823e1ca9589ec24.
-rw-r--r--drivers/ata/libata-scsi.c3
-rw-r--r--include/linux/libata.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index d6ff64248c23..0586f66d70fa 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2514,8 +2514,7 @@ static unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf)
rbuf[14] = (lowest_aligned >> 8) & 0x3f;
rbuf[15] = lowest_aligned;
- if (ata_id_has_trim(args->id) &&
- !(dev->horkage & ATA_HORKAGE_NOTRIM)) {
+ if (ata_id_has_trim(args->id)) {
rbuf[14] |= 0x80; /* TPE */
if (ata_id_has_zero_after_trim(args->id))
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8f6a07441b85..b3a816f4c0c4 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -429,7 +429,6 @@ enum {
ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19), /* don't use queued TRIM */
ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */
ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */
- ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */
/* DMA mask for user DMA control: User visible values; DO NOT
renumber */