diff options
author | Jeff Garzik <jeff@garzik.org> | 2011-02-15 01:13:24 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2011-03-02 02:36:45 -0500 |
commit | 4fca377f7488095ab04035e2bfe5c59873c22382 (patch) | |
tree | ee59e1db405f62bfa7b45214d4299fa460ce4fe5 /drivers/ata | |
parent | 00dd4998a60599d98b4d6635820a1fbeafa5b021 (diff) |
[libata] trivial: trim trailing whitespace for drivers/ata/*.[ch]
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ata_generic.c | 2 | ||||
-rw-r--r-- | drivers/ata/ata_piix.c | 2 | ||||
-rw-r--r-- | drivers/ata/libata-core.c | 10 | ||||
-rw-r--r-- | drivers/ata/libata-sff.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_hpt3x3.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_it821x.c | 4 | ||||
-rw-r--r-- | drivers/ata/pata_marvell.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_ninja32.c | 2 | ||||
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 6981f7680a00..721d38bfa339 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
@@ -237,7 +237,7 @@ static struct pci_device_id ata_generic[] = { | |||
237 | #endif | 237 | #endif |
238 | /* Intel, IDE class device */ | 238 | /* Intel, IDE class device */ |
239 | { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | 239 | { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
240 | PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, | 240 | PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, |
241 | .driver_data = ATA_GEN_INTEL_IDER }, | 241 | .driver_data = ATA_GEN_INTEL_IDER }, |
242 | /* Must come last. If you add entries adjust this table appropriately */ | 242 | /* Must come last. If you add entries adjust this table appropriately */ |
243 | { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL), | 243 | { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL), |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 6cb14ca8ee85..cdec4ab3b159 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -230,7 +230,7 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
230 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 230 | { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
231 | 231 | ||
232 | /* SATA ports */ | 232 | /* SATA ports */ |
233 | 233 | ||
234 | /* 82801EB (ICH5) */ | 234 | /* 82801EB (ICH5) */ |
235 | { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, | 235 | { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, |
236 | /* 82801EB (ICH5) */ | 236 | /* 82801EB (ICH5) */ |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 7d3c71a3750a..b91e19cab102 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -4210,7 +4210,7 @@ static int glob_match (const char *text, const char *pattern) | |||
4210 | return 0; /* End of both strings: match */ | 4210 | return 0; /* End of both strings: match */ |
4211 | return 1; /* No match */ | 4211 | return 1; /* No match */ |
4212 | } | 4212 | } |
4213 | 4213 | ||
4214 | static unsigned long ata_dev_blacklisted(const struct ata_device *dev) | 4214 | static unsigned long ata_dev_blacklisted(const struct ata_device *dev) |
4215 | { | 4215 | { |
4216 | unsigned char model_num[ATA_ID_PROD_LEN + 1]; | 4216 | unsigned char model_num[ATA_ID_PROD_LEN + 1]; |
@@ -5479,7 +5479,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host) | |||
5479 | ap = kzalloc(sizeof(*ap), GFP_KERNEL); | 5479 | ap = kzalloc(sizeof(*ap), GFP_KERNEL); |
5480 | if (!ap) | 5480 | if (!ap) |
5481 | return NULL; | 5481 | return NULL; |
5482 | 5482 | ||
5483 | ap->pflags |= ATA_PFLAG_INITIALIZING; | 5483 | ap->pflags |= ATA_PFLAG_INITIALIZING; |
5484 | ap->lock = &host->lock; | 5484 | ap->lock = &host->lock; |
5485 | ap->print_id = -1; | 5485 | ap->print_id = -1; |
@@ -5923,7 +5923,7 @@ int ata_port_probe(struct ata_port *ap) | |||
5923 | static void async_port_probe(void *data, async_cookie_t cookie) | 5923 | static void async_port_probe(void *data, async_cookie_t cookie) |
5924 | { | 5924 | { |
5925 | struct ata_port *ap = data; | 5925 | struct ata_port *ap = data; |
5926 | 5926 | ||
5927 | /* | 5927 | /* |
5928 | * If we're not allowed to scan this host in parallel, | 5928 | * If we're not allowed to scan this host in parallel, |
5929 | * we need to wait until all previous scans have completed | 5929 | * we need to wait until all previous scans have completed |
@@ -5981,7 +5981,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5981 | for (i = 0; i < host->n_ports; i++) | 5981 | for (i = 0; i < host->n_ports; i++) |
5982 | host->ports[i]->print_id = ata_print_id++; | 5982 | host->ports[i]->print_id = ata_print_id++; |
5983 | 5983 | ||
5984 | 5984 | ||
5985 | /* Create associated sysfs transport objects */ | 5985 | /* Create associated sysfs transport objects */ |
5986 | for (i = 0; i < host->n_ports; i++) { | 5986 | for (i = 0; i < host->n_ports; i++) { |
5987 | rc = ata_tport_add(host->dev,host->ports[i]); | 5987 | rc = ata_tport_add(host->dev,host->ports[i]); |
@@ -6469,7 +6469,7 @@ static int __init ata_init(void) | |||
6469 | ata_sff_exit(); | 6469 | ata_sff_exit(); |
6470 | rc = -ENOMEM; | 6470 | rc = -ENOMEM; |
6471 | goto err_out; | 6471 | goto err_out; |
6472 | } | 6472 | } |
6473 | 6473 | ||
6474 | printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n"); | 6474 | printk(KERN_DEBUG "libata version " DRV_VERSION " loaded.\n"); |
6475 | return 0; | 6475 | return 0; |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index af6141bb1ba3..e75a02d61a8f 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -1336,7 +1336,7 @@ static void ata_sff_pio_task(struct work_struct *work) | |||
1336 | u8 status; | 1336 | u8 status; |
1337 | int poll_next; | 1337 | int poll_next; |
1338 | 1338 | ||
1339 | BUG_ON(ap->sff_pio_task_link == NULL); | 1339 | BUG_ON(ap->sff_pio_task_link == NULL); |
1340 | /* qc can be NULL if timeout occurred */ | 1340 | /* qc can be NULL if timeout occurred */ |
1341 | qc = ata_qc_from_tag(ap, link->active_tag); | 1341 | qc = ata_qc_from_tag(ap, link->active_tag); |
1342 | if (!qc) { | 1342 | if (!qc) { |
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c index b63d5e2d4628..24d7df81546b 100644 --- a/drivers/ata/pata_hpt3x3.c +++ b/drivers/ata/pata_hpt3x3.c | |||
@@ -151,7 +151,7 @@ static struct ata_port_operations hpt3x3_port_ops = { | |||
151 | .check_atapi_dma= hpt3x3_atapi_dma, | 151 | .check_atapi_dma= hpt3x3_atapi_dma, |
152 | .freeze = hpt3x3_freeze, | 152 | .freeze = hpt3x3_freeze, |
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | }; | 155 | }; |
156 | 156 | ||
157 | /** | 157 | /** |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index aa0e0c51cc08..2d15f2548a10 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
@@ -616,7 +616,7 @@ static void it821x_display_disk(int n, u8 *buf) | |||
616 | if (buf[52] > 4) /* No Disk */ | 616 | if (buf[52] > 4) /* No Disk */ |
617 | return; | 617 | return; |
618 | 618 | ||
619 | ata_id_c_string((u16 *)buf, id, 0, 41); | 619 | ata_id_c_string((u16 *)buf, id, 0, 41); |
620 | 620 | ||
621 | if (buf[51]) { | 621 | if (buf[51]) { |
622 | mode = ffs(buf[51]); | 622 | mode = ffs(buf[51]); |
@@ -910,7 +910,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | |||
910 | rc = pcim_enable_device(pdev); | 910 | rc = pcim_enable_device(pdev); |
911 | if (rc) | 911 | if (rc) |
912 | return rc; | 912 | return rc; |
913 | 913 | ||
914 | if (pdev->vendor == PCI_VENDOR_ID_RDC) { | 914 | if (pdev->vendor == PCI_VENDOR_ID_RDC) { |
915 | /* Deal with Vortex86SX */ | 915 | /* Deal with Vortex86SX */ |
916 | if (pdev->revision == 0x11) | 916 | if (pdev->revision == 0x11) |
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index dd38083dcbeb..75a6a0c0094f 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
@@ -38,7 +38,7 @@ static int marvell_pata_active(struct pci_dev *pdev) | |||
38 | 38 | ||
39 | /* We don't yet know how to do this for other devices */ | 39 | /* We don't yet know how to do this for other devices */ |
40 | if (pdev->device != 0x6145) | 40 | if (pdev->device != 0x6145) |
41 | return 1; | 41 | return 1; |
42 | 42 | ||
43 | barp = pci_iomap(pdev, 5, 0x10); | 43 | barp = pci_iomap(pdev, 5, 0x10); |
44 | if (barp == NULL) | 44 | if (barp == NULL) |
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c index cc50bd09aa26..e277a142138c 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c | |||
@@ -165,7 +165,7 @@ static int ninja32_reinit_one(struct pci_dev *pdev) | |||
165 | return rc; | 165 | return rc; |
166 | ninja32_program(host->iomap[0]); | 166 | ninja32_program(host->iomap[0]); |
167 | ata_host_resume(host); | 167 | ata_host_resume(host); |
168 | return 0; | 168 | return 0; |
169 | } | 169 | } |
170 | #endif | 170 | #endif |
171 | 171 | ||
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 806292160b3f..29af660d968b 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -124,7 +124,7 @@ static unsigned int ata_data_xfer_8bit(struct ata_device *dev, | |||
124 | * reset will recover the device. | 124 | * reset will recover the device. |
125 | * | 125 | * |
126 | */ | 126 | */ |
127 | 127 | ||
128 | static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc) | 128 | static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc) |
129 | { | 129 | { |
130 | int count; | 130 | int count; |