[PATCH #upstream-fixes 1/2] libata: cosmetic updates

[PATCH #upstream-fixes 1/2] libata: cosmetic updates

[Tejun Heo]

We're about to add more SATA_* and ATA_ACPI_FILTER_* constants.
Reformat them in preparation.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
 drivers/ata/libata-acpi.c |   12 ++++++------
 include/linux/ata.h       |    4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: ata/drivers/ata/libata-acpi.c
===================================================================
--- ata.orig/drivers/ata/libata-acpi.c
+++ ata/drivers/ata/libata-acpi.c
@@ -21,13 +21,13 @@
 #include <acpi/acpi_bus.h>

 enum {
-	ATA_ACPI_FILTER_SETXFER	= 1 << 0,
-	ATA_ACPI_FILTER_LOCK	= 1 << 1,
-	ATA_ACPI_FILTER_DIPM	= 1 << 2,
+	ATA_ACPI_FILTER_SETXFER		= 1 << 0,
+	ATA_ACPI_FILTER_LOCK		= 1 << 1,
+	ATA_ACPI_FILTER_DIPM		= 1 << 2,

-	ATA_ACPI_FILTER_DEFAULT	= ATA_ACPI_FILTER_SETXFER |
-				  ATA_ACPI_FILTER_LOCK |
-				  ATA_ACPI_FILTER_DIPM,
+	ATA_ACPI_FILTER_DEFAULT		= ATA_ACPI_FILTER_SETXFER |
+					  ATA_ACPI_FILTER_LOCK |
+					  ATA_ACPI_FILTER_DIPM,
 };

 static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
Index: ata/include/linux/ata.h
===================================================================
--- ata.orig/include/linux/ata.h
+++ ata/include/linux/ata.h
@@ -304,8 +304,8 @@ enum {
 	SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */

 	/* SETFEATURE Sector counts for SATA features */
-	SATA_AN			= 0x05,  /* Asynchronous Notification */
-	SATA_DIPM		= 0x03,  /* Device Initiated Power Management */
+	SATA_DIPM		= 0x03,	/* Device Initiated Power Management */
+	SATA_AN			= 0x05,	/* Asynchronous Notification */

 	/* feature values for SET_MAX */
 	ATA_SET_MAX_ADDR	= 0x00,

Re: [PATCH #upstream-fixes 1/2] libata: cosmetic updates

[Tejun Heo]

Tejun Heo wrote:
> We're about to add more SATA_* and ATA_ACPI_FILTER_* constants.
> Reformat them in preparation.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>

I was about to send the second patch which filters out the offending
commands by default but now that I think more about it I think it
would be better to specifically blacklist the machine.  So, please
don't commit the first patch.  I'll re-post later along with updated
patch.

Thanks.

-- 
tejun

Re: [PATCH #upstream-fixes 1/2] libata: cosmetic updates

[Jeff Garzik]

Tejun Heo wrote:
> Tejun Heo wrote:
>> We're about to add more SATA_* and ATA_ACPI_FILTER_* constants.
>> Reformat them in preparation.
>>
>> Signed-off-by: Tejun Heo <tj@kernel.org>
> 
> I was about to send the second patch which filters out the offending
> commands by default but now that I think more about it I think it
> would be better to specifically blacklist the machine.  So, please
> don't commit the first patch.  I'll re-post later along with updated
> patch.

Will do...