diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 06:42:56 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 20:59:42 -0400 |
commit | 2dcb407e61458ded17503d6bd12b8c064965368b (patch) | |
tree | 6044e032197b84f9943a385b0c9dbb6656c3f97f /drivers/ata/ahci.c | |
parent | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (diff) |
[libata] checkpatch-inspired cleanups
Tackle the relatively sane complaints of checkpatch --file.
The vast majority is indentation and whitespace changes, the rest are
* #include fixes
* printk KERN_xxx prefix addition
* BSS/initializer cleanups
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r-- | drivers/ata/ahci.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 47c806040524..95229e77bffe 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -227,7 +227,7 @@ struct ahci_port_priv { | |||
227 | 227 | ||
228 | static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val); | 228 | static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val); |
229 | static int ahci_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val); | 229 | static int ahci_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val); |
230 | static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); | 230 | static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); |
231 | static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); | 231 | static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc); |
232 | static void ahci_irq_clear(struct ata_port *ap); | 232 | static void ahci_irq_clear(struct ata_port *ap); |
233 | static int ahci_port_start(struct ata_port *ap); | 233 | static int ahci_port_start(struct ata_port *ap); |
@@ -729,7 +729,7 @@ static int ahci_stop_engine(struct ata_port *ap) | |||
729 | 729 | ||
730 | /* wait for engine to stop. This could be as long as 500 msec */ | 730 | /* wait for engine to stop. This could be as long as 500 msec */ |
731 | tmp = ata_wait_register(port_mmio + PORT_CMD, | 731 | tmp = ata_wait_register(port_mmio + PORT_CMD, |
732 | PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); | 732 | PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); |
733 | if (tmp & PORT_CMD_LIST_ON) | 733 | if (tmp & PORT_CMD_LIST_ON) |
734 | return -EIO; | 734 | return -EIO; |
735 | 735 | ||
@@ -1564,9 +1564,9 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) | |||
1564 | if (!irq_stat) | 1564 | if (!irq_stat) |
1565 | return IRQ_NONE; | 1565 | return IRQ_NONE; |
1566 | 1566 | ||
1567 | spin_lock(&host->lock); | 1567 | spin_lock(&host->lock); |
1568 | 1568 | ||
1569 | for (i = 0; i < host->n_ports; i++) { | 1569 | for (i = 0; i < host->n_ports; i++) { |
1570 | struct ata_port *ap; | 1570 | struct ata_port *ap; |
1571 | 1571 | ||
1572 | if (!(irq_stat & (1 << i))) | 1572 | if (!(irq_stat & (1 << i))) |
@@ -1829,9 +1829,9 @@ static int ahci_port_start(struct ata_port *ap) | |||
1829 | pp->cmd_tbl_dma = mem_dma; | 1829 | pp->cmd_tbl_dma = mem_dma; |
1830 | 1830 | ||
1831 | /* | 1831 | /* |
1832 | * Save off initial list of interrupts to be enabled. | 1832 | * Save off initial list of interrupts to be enabled. |
1833 | * This could be changed later | 1833 | * This could be changed later |
1834 | */ | 1834 | */ |
1835 | pp->intr_mask = DEF_PORT_IRQ; | 1835 | pp->intr_mask = DEF_PORT_IRQ; |
1836 | 1836 | ||
1837 | ap->private_data = pp; | 1837 | ap->private_data = pp; |
@@ -1918,12 +1918,12 @@ static void ahci_print_info(struct ata_host *host) | |||
1918 | dev_printk(KERN_INFO, &pdev->dev, | 1918 | dev_printk(KERN_INFO, &pdev->dev, |
1919 | "AHCI %02x%02x.%02x%02x " | 1919 | "AHCI %02x%02x.%02x%02x " |
1920 | "%u slots %u ports %s Gbps 0x%x impl %s mode\n" | 1920 | "%u slots %u ports %s Gbps 0x%x impl %s mode\n" |
1921 | , | 1921 | , |
1922 | 1922 | ||
1923 | (vers >> 24) & 0xff, | 1923 | (vers >> 24) & 0xff, |
1924 | (vers >> 16) & 0xff, | 1924 | (vers >> 16) & 0xff, |
1925 | (vers >> 8) & 0xff, | 1925 | (vers >> 8) & 0xff, |
1926 | vers & 0xff, | 1926 | vers & 0xff, |
1927 | 1927 | ||
1928 | ((cap >> 8) & 0x1f) + 1, | 1928 | ((cap >> 8) & 0x1f) + 1, |
1929 | (cap & 0x1f) + 1, | 1929 | (cap & 0x1f) + 1, |
@@ -1935,7 +1935,7 @@ static void ahci_print_info(struct ata_host *host) | |||
1935 | "flags: " | 1935 | "flags: " |
1936 | "%s%s%s%s%s%s%s" | 1936 | "%s%s%s%s%s%s%s" |
1937 | "%s%s%s%s%s%s%s\n" | 1937 | "%s%s%s%s%s%s%s\n" |
1938 | , | 1938 | , |
1939 | 1939 | ||
1940 | cap & (1 << 31) ? "64bit " : "", | 1940 | cap & (1 << 31) ? "64bit " : "", |
1941 | cap & (1 << 30) ? "ncq " : "", | 1941 | cap & (1 << 30) ? "ncq " : "", |