aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-26 05:51:33 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-26 05:51:33 -0500
commita84471fe269c38ea3725345c43ad64e5f489bea2 (patch)
tree0f07513cb4c072cd867292b389b50393b3ebe093 /drivers/ata
parentfb621e2fde735abab854586d52c96c5624bcb5b8 (diff)
[libata] Trim trailing whitespace.
No code changes. Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c2
-rw-r--r--drivers/ata/libata-sff.c6
-rw-r--r--drivers/ata/pata_cs5520.c2
-rw-r--r--drivers/ata/pata_scc.c4
-rw-r--r--drivers/ata/pata_sil680.c4
-rw-r--r--drivers/ata/pata_via.c2
-rw-r--r--drivers/ata/sata_nv.c8
-rw-r--r--drivers/ata/sata_sis.c2
-rw-r--r--drivers/ata/sata_via.c6
9 files changed, 18 insertions, 18 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 9825a90d4169..e74e9726046e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1719,7 +1719,7 @@ int ata_dev_configure(struct ata_device *dev)
1719 "%s: %s, %s, max %s\n", 1719 "%s: %s, %s, max %s\n",
1720 revbuf, modelbuf, fwrevbuf, 1720 revbuf, modelbuf, fwrevbuf,
1721 ata_mode_string(xfer_mask)); 1721 ata_mode_string(xfer_mask));
1722 ata_dev_printk(dev, KERN_INFO, 1722 ata_dev_printk(dev, KERN_INFO,
1723 "%Lu sectors, multi %u, CHS %u/%u/%u\n", 1723 "%Lu sectors, multi %u, CHS %u/%u/%u\n",
1724 (unsigned long long)dev->n_sectors, 1724 (unsigned long long)dev->n_sectors,
1725 dev->multi_count, dev->cylinders, 1725 dev->multi_count, dev->cylinders,
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 7fea094e6d3a..2ffcca063d80 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -521,7 +521,7 @@ void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc)
521static int ata_resources_present(struct pci_dev *pdev, int port) 521static int ata_resources_present(struct pci_dev *pdev, int port)
522{ 522{
523 int i; 523 int i;
524 524
525 /* Check the PCI resources for this channel are enabled */ 525 /* Check the PCI resources for this channel are enabled */
526 port = port * 2; 526 port = port * 2;
527 for (i = 0; i < 2; i ++) { 527 for (i = 0; i < 2; i ++) {
@@ -531,7 +531,7 @@ static int ata_resources_present(struct pci_dev *pdev, int port)
531 } 531 }
532 return 1; 532 return 1;
533} 533}
534 534
535/** 535/**
536 * ata_pci_init_native_mode - Initialize native-mode driver 536 * ata_pci_init_native_mode - Initialize native-mode driver
537 * @pdev: pci device to be initialized 537 * @pdev: pci device to be initialized
@@ -576,7 +576,7 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
576 576
577 probe_ent->irq = pdev->irq; 577 probe_ent->irq = pdev->irq;
578 probe_ent->irq_flags = IRQF_SHARED; 578 probe_ent->irq_flags = IRQF_SHARED;
579 579
580 /* Discard disabled ports. Some controllers show their 580 /* Discard disabled ports. Some controllers show their
581 unused channels this way */ 581 unused channels this way */
582 if (ata_resources_present(pdev, 0) == 0) 582 if (ata_resources_present(pdev, 0) == 0)
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index b49d8b70577a..21dcf395791b 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -348,7 +348,7 @@ static int cs5520_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
348 pci_save_state(pdev); 348 pci_save_state(pdev);
349 return 0; 349 return 0;
350} 350}
351 351
352/* For now keep DMA off. We can set it for all but A rev CS5510 once the 352/* For now keep DMA off. We can set it for all but A rev CS5510 once the
353 core ATA code can handle it */ 353 core ATA code can handle it */
354 354
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index de04042f34d3..45866098fbf9 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -233,7 +233,7 @@ static void scc_set_dmamode (struct ata_port *ap, struct ata_device *adev)
233 void __iomem *tdvhsel_port = ctrl_base + SCC_CTL_TDVHSEL; 233 void __iomem *tdvhsel_port = ctrl_base + SCC_CTL_TDVHSEL;
234 int offset, idx; 234 int offset, idx;
235 235
236 if (in_be32(cckctrl_port) & CCKCTRL_ATACLKOEN) 236 if (in_be32(cckctrl_port) & CCKCTRL_ATACLKOEN)
237 offset = 1; /* 133MHz */ 237 offset = 1; /* 133MHz */
238 else 238 else
239 offset = 0; /* 100MHz */ 239 offset = 0; /* 100MHz */
@@ -720,7 +720,7 @@ static u8 scc_bmdma_status (struct ata_port *ap)
720 720
721 host_stat = in_be32(mmio + SCC_DMA_STATUS); 721 host_stat = in_be32(mmio + SCC_DMA_STATUS);
722 722
723 /* Workaround for PTERADD: emulate DMA_INTR when 723 /* Workaround for PTERADD: emulate DMA_INTR when
724 * - IDE_STATUS[ERR] = 1 724 * - IDE_STATUS[ERR] = 1
725 * - INT_STATUS[INTRQ] = 1 725 * - INT_STATUS[INTRQ] = 1
726 * - DMA_STATUS[IORACTA] = 1 726 * - DMA_STATUS[IORACTA] = 1
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 5f10a33f92f5..1cb67b221c28 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -157,10 +157,10 @@ static void sil680_set_piomode(struct ata_port *ap, struct ata_device *adev)
157 157
158 pci_read_config_word(pdev, tfaddr-2, &reg); 158 pci_read_config_word(pdev, tfaddr-2, &reg);
159 pci_read_config_byte(pdev, addr_mask, &mode); 159 pci_read_config_byte(pdev, addr_mask, &mode);
160 160
161 reg &= ~0x0200; /* Clear IORDY */ 161 reg &= ~0x0200; /* Clear IORDY */
162 mode &= ~(3 << port_shift); /* Clear IORDY and DMA bits */ 162 mode &= ~(3 << port_shift); /* Clear IORDY and DMA bits */
163 163
164 if (ata_pio_need_iordy(adev)) { 164 if (ata_pio_need_iordy(adev)) {
165 reg |= 0x0200; /* Enable IORDY */ 165 reg |= 0x0200; /* Enable IORDY */
166 mode |= 1 << port_shift; 166 mode |= 1 << port_shift;
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 220fcd6c5492..20fc2d0dcfa1 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -170,7 +170,7 @@ static int via_pre_reset(struct ata_port *ap)
170 ap->cbl = ATA_CBL_PATA40; 170 ap->cbl = ATA_CBL_PATA40;
171 else 171 else
172 ap->cbl = ATA_CBL_PATA_UNK; 172 ap->cbl = ATA_CBL_PATA_UNK;
173 173
174 174
175 return ata_std_prereset(ap); 175 return ata_std_prereset(ap);
176} 176}
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 783281ec28c6..30eed12b3631 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -669,18 +669,18 @@ static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb)
669 cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature); 669 cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature);
670 } else 670 } else
671 cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB); 671 cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB);
672 672
673 cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect); 673 cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect);
674 cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal); 674 cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal);
675 cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam); 675 cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam);
676 cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah); 676 cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah);
677 } 677 }
678 678
679 if(tf->flags & ATA_TFLAG_DEVICE) 679 if(tf->flags & ATA_TFLAG_DEVICE)
680 cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device); 680 cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device);
681 681
682 cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND); 682 cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND);
683 683
684 while(idx < 12) 684 while(idx < 12)
685 cpb[idx++] = cpu_to_le16(IGN); 685 cpb[idx++] = cpu_to_le16(IGN);
686 686
@@ -1402,7 +1402,7 @@ static void nv_adma_error_handler(struct ata_port *ap)
1402 void __iomem *mmio = pp->ctl_block; 1402 void __iomem *mmio = pp->ctl_block;
1403 int i; 1403 int i;
1404 u16 tmp; 1404 u16 tmp;
1405 1405
1406 if(ata_tag_valid(ap->active_tag) || ap->sactive) { 1406 if(ata_tag_valid(ap->active_tag) || ap->sactive) {
1407 u32 notifier = readl(mmio + NV_ADMA_NOTIFIER); 1407 u32 notifier = readl(mmio + NV_ADMA_NOTIFIER);
1408 u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR); 1408 u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR);
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index fd694b6a6f8a..1879e0cd56aa 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -309,7 +309,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
309 case 0x10: 309 case 0x10:
310 ppi[1] = &sis_info133; 310 ppi[1] = &sis_info133;
311 break; 311 break;
312 312
313 case 0x30: 313 case 0x30:
314 ppi[0] = &sis_info133; 314 ppi[0] = &sis_info133;
315 break; 315 break;
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index fe9101a1dadc..becba950c7e5 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -60,7 +60,7 @@ enum {
60 SATA_PATA_SHARING = 0x49, /* PATA/SATA sharing func ctrl */ 60 SATA_PATA_SHARING = 0x49, /* PATA/SATA sharing func ctrl */
61 PATA_UDMA_TIMING = 0xB3, /* PATA timing for DMA/ cable detect */ 61 PATA_UDMA_TIMING = 0xB3, /* PATA timing for DMA/ cable detect */
62 PATA_PIO_TIMING = 0xAB, /* PATA timing register */ 62 PATA_PIO_TIMING = 0xAB, /* PATA timing register */
63 63
64 PORT0 = (1 << 1), 64 PORT0 = (1 << 1),
65 PORT1 = (1 << 0), 65 PORT1 = (1 << 0),
66 ALL_PORTS = PORT0 | PORT1, 66 ALL_PORTS = PORT0 | PORT1,
@@ -151,7 +151,7 @@ static const struct ata_port_operations vt6420_sata_ops = {
151 151
152static const struct ata_port_operations vt6421_pata_ops = { 152static const struct ata_port_operations vt6421_pata_ops = {
153 .port_disable = ata_port_disable, 153 .port_disable = ata_port_disable,
154 154
155 .set_piomode = vt6421_set_pio_mode, 155 .set_piomode = vt6421_set_pio_mode,
156 .set_dmamode = vt6421_set_dma_mode, 156 .set_dmamode = vt6421_set_dma_mode,
157 157
@@ -185,7 +185,7 @@ static const struct ata_port_operations vt6421_pata_ops = {
185 185
186static const struct ata_port_operations vt6421_sata_ops = { 186static const struct ata_port_operations vt6421_sata_ops = {
187 .port_disable = ata_port_disable, 187 .port_disable = ata_port_disable,
188 188
189 .tf_load = ata_tf_load, 189 .tf_load = ata_tf_load,
190 .tf_read = ata_tf_read, 190 .tf_read = ata_tf_read,
191 .check_status = ata_check_status, 191 .check_status = ata_check_status,