Patchwork [REDIFFED,1/4,#upstream] libata: cosmetic updates

login
register
mail settings
Submitter Tejun Heo
Date Sept. 15, 2009, 7:16 p.m.
Message ID <4AAFE7F4.9050400@kernel.org>
Download mbox | patch
Permalink /patch/33659/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Tejun Heo - Sept. 15, 2009, 7:16 p.m.
We're about to add more SATA_* and ATA_ACPI_FILTER_* constants.
Reformat them in preparation.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
Almost forgot about this series.  Here's the refreshed version.

Thanks.

 drivers/ata/libata-acpi.c |   10 ----------
 include/linux/ata.h       |    6 +++---
 include/linux/libata.h    |    9 +++++++++
 3 files changed, 12 insertions(+), 13 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - Oct. 6, 2009, 4:25 a.m.
On 09/15/2009 03:16 PM, 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>
> ---
> Almost forgot about this series.  Here's the refreshed version.
>
> Thanks.
>
>   drivers/ata/libata-acpi.c |   10 ----------
>   include/linux/ata.h       |    6 +++---
>   include/linux/libata.h    |    9 +++++++++
>   3 files changed, 12 insertions(+), 13 deletions(-)

applied


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: ata/drivers/ata/libata-acpi.c
===================================================================
--- ata.orig/drivers/ata/libata-acpi.c
+++ ata/drivers/ata/libata-acpi.c
@@ -20,16 +20,6 @@ 

 #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_DEFAULT	= ATA_ACPI_FILTER_SETXFER |
-				  ATA_ACPI_FILTER_LOCK |
-				  ATA_ACPI_FILTER_DIPM,
-};
-
 static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT;
 module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644);
 MODULE_PARM_DESC(acpi_gtf_filter, "filter mask for ACPI _GTF commands, set to filter out (0x1=set xfermode, 0x2=lock/freeze lock, 0x4=DIPM)");
Index: ata/include/linux/ata.h
===================================================================
--- ata.orig/include/linux/ata.h
+++ ata/include/linux/ata.h
@@ -334,9 +334,9 @@  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_FPDMA_AA		= 0x02,  /* DMA Setup FIS Auto-Activate */
+	SATA_FPDMA_AA		= 0x02, /* FPDMA Setup FIS Auto-Activate */
+	SATA_DIPM		= 0x03,	/* Device Initiated Power Management */
+	SATA_AN			= 0x05,	/* Asynchronous Notification */

 	/* feature values for SET_MAX */
 	ATA_SET_MAX_ADDR	= 0x00,
Index: ata/include/linux/libata.h
===================================================================
--- ata.orig/include/linux/libata.h
+++ ata/include/linux/libata.h
@@ -418,6 +418,15 @@  enum {
 				  ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER |
 				  ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE |
 				  ATA_TIMING_UDMA,
+
+	/* ACPI constants */
+	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,
 };

 enum ata_xfer_mask {