diff options
-rw-r--r-- | drivers/ata/libata-acpi.c | 10 | ||||
-rw-r--r-- | include/linux/ata.h | 6 | ||||
-rw-r--r-- | include/linux/libata.h | 9 |
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 01964b6e6f6b..719e7d237dc8 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -20,16 +20,6 @@ | |||
20 | 20 | ||
21 | #include <acpi/acpi_bus.h> | 21 | #include <acpi/acpi_bus.h> |
22 | 22 | ||
23 | enum { | ||
24 | ATA_ACPI_FILTER_SETXFER = 1 << 0, | ||
25 | ATA_ACPI_FILTER_LOCK = 1 << 1, | ||
26 | ATA_ACPI_FILTER_DIPM = 1 << 2, | ||
27 | |||
28 | ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER | | ||
29 | ATA_ACPI_FILTER_LOCK | | ||
30 | ATA_ACPI_FILTER_DIPM, | ||
31 | }; | ||
32 | |||
33 | static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; | 23 | static unsigned int ata_acpi_gtf_filter = ATA_ACPI_FILTER_DEFAULT; |
34 | module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644); | 24 | module_param_named(acpi_gtf_filter, ata_acpi_gtf_filter, int, 0644); |
35 | 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)"); | 25 | 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)"); |
diff --git a/include/linux/ata.h b/include/linux/ata.h index 6299a259ed19..7c5beafa972c 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
@@ -334,9 +334,9 @@ enum { | |||
334 | SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */ | 334 | SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */ |
335 | 335 | ||
336 | /* SETFEATURE Sector counts for SATA features */ | 336 | /* SETFEATURE Sector counts for SATA features */ |
337 | SATA_AN = 0x05, /* Asynchronous Notification */ | 337 | SATA_FPDMA_AA = 0x02, /* FPDMA Setup FIS Auto-Activate */ |
338 | SATA_DIPM = 0x03, /* Device Initiated Power Management */ | 338 | SATA_DIPM = 0x03, /* Device Initiated Power Management */ |
339 | SATA_FPDMA_AA = 0x02, /* DMA Setup FIS Auto-Activate */ | 339 | SATA_AN = 0x05, /* Asynchronous Notification */ |
340 | 340 | ||
341 | /* feature values for SET_MAX */ | 341 | /* feature values for SET_MAX */ |
342 | ATA_SET_MAX_ADDR = 0x00, | 342 | ATA_SET_MAX_ADDR = 0x00, |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 76319bf03e37..5b2f7491fb26 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -418,6 +418,15 @@ enum { | |||
418 | ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER | | 418 | ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER | |
419 | ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE | | 419 | ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE | |
420 | ATA_TIMING_UDMA, | 420 | ATA_TIMING_UDMA, |
421 | |||
422 | /* ACPI constants */ | ||
423 | ATA_ACPI_FILTER_SETXFER = 1 << 0, | ||
424 | ATA_ACPI_FILTER_LOCK = 1 << 1, | ||
425 | ATA_ACPI_FILTER_DIPM = 1 << 2, | ||
426 | |||
427 | ATA_ACPI_FILTER_DEFAULT = ATA_ACPI_FILTER_SETXFER | | ||
428 | ATA_ACPI_FILTER_LOCK | | ||
429 | ATA_ACPI_FILTER_DIPM, | ||
421 | }; | 430 | }; |
422 | 431 | ||
423 | enum ata_xfer_mask { | 432 | enum ata_xfer_mask { |