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

Commit f1bce7f8 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: cosmetic updates 



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

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 4c521c8e

drivers/ata/libata-acpi.c

+0 −10
Original line number Diff line number Diff line
@@ -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)");

include/linux/ata.h

+3 −3
Original line number Diff line number Diff line
@@ -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_FPDMA_AA		= 0x02, /* FPDMA Setup FIS Auto-Activate */

	SATA_DIPM		= 0x03,	/* Device Initiated Power Management */

	SATA_FPDMA_AA		= 0x02,  /* DMA Setup FIS Auto-Activate */

	SATA_AN			= 0x05,	/* Asynchronous Notification */



	/* feature values for SET_MAX */

	ATA_SET_MAX_ADDR	= 0x00,

include/linux/libata.h

+9 −0
Original line number Diff line number Diff line
@@ -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 {