Revert "libata: add ATA_HORKAGE_NOTRIM"

This reverts commit e7a84605061b205350654641d823e1ca9589ec24.

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index d6ff64248c23bbfdfa0bcf9d450777339a1c723b..0586f66d70fad3a52e37e2cc87bc6c5de5e8ec7c 100644 (file)
--- 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 8f6a07441b85dca16f946a8f8fea9708208f5021..b3a816f4c0c4a26bdda254c81bd0a0dc43da571b 100644 (file)
--- 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 */