Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 514f0a94 authored by Sasha Levin's avatar Sasha Levin
Browse files

Revert "libata: add ATA_HORKAGE_NOTRIM" 

This reverts commit e7a84605.
parent ccdf38d8

drivers/ata/libata-scsi.c

+1 −2
Original line number Diff line number Diff line
@@ -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))

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */