aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-11 11:14:06 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-09 17:39:29 -0500
commitf20b16ff7c19d1c369ee07470952aca093551ed0 (patch)
treec1c4aa20688be65754b73e757650c45f416bf788 /drivers
parent155d2916d9474f81178f501664499f40833c59b2 (diff)
[libata] trim trailing whitespace
Most of these contributed by that mysterious figger known as A.C. Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/ata_piix.c2
-rw-r--r--drivers/ata/libata-core.c2
-rw-r--r--drivers/ata/pata_ali.c4
-rw-r--r--drivers/ata/pata_cs5520.c2
-rw-r--r--drivers/ata/pata_cs5530.c8
-rw-r--r--drivers/ata/pata_hpt366.c2
-rw-r--r--drivers/ata/pata_hpt37x.c4
-rw-r--r--drivers/ata/pata_hpt3x3.c2
-rw-r--r--drivers/ata/pata_jmicron.c2
-rw-r--r--drivers/ata/pata_marvell.c4
-rw-r--r--drivers/ata/pata_serverworks.c2
-rw-r--r--drivers/ata/pata_sil680.c2
-rw-r--r--drivers/ata/pata_sis.c2
-rw-r--r--drivers/ata/pata_via.c10
-rw-r--r--drivers/ata/pata_winbond.c16
-rw-r--r--drivers/ata/sata_nv.c18
-rw-r--r--drivers/ata/sata_sis.c2
-rw-r--r--drivers/ata/sata_via.c2
18 files changed, 43 insertions, 43 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 47701b286f8b..7959e4c9f13b 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -632,7 +632,7 @@ static int piix_pata_prereset(struct ata_port *ap)
632 632
633 if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no])) 633 if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
634 return -ENOENT; 634 return -ENOENT;
635 635
636 ap->cbl = ATA_CBL_PATA40; 636 ap->cbl = ATA_CBL_PATA40;
637 return ata_std_prereset(ap); 637 return ata_std_prereset(ap);
638} 638}
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 667acd283364..e267319bb2b1 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5770,7 +5770,7 @@ int ata_device_add(const struct ata_probe_ent *ent)
5770 int rc; 5770 int rc;
5771 5771
5772 DPRINTK("ENTER\n"); 5772 DPRINTK("ENTER\n");
5773 5773
5774 if (ent->irq == 0) { 5774 if (ent->irq == 0) {
5775 dev_printk(KERN_ERR, dev, "is not available: No interrupt assigned.\n"); 5775 dev_printk(KERN_ERR, dev, "is not available: No interrupt assigned.\n");
5776 return 0; 5776 return 0;
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index c5d61d1911a5..2035417fc1ab 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -504,7 +504,7 @@ static struct ata_port_operations ali_c5_port_ops = {
504 * Perform the setup on the device that must be done both at boot 504 * Perform the setup on the device that must be done both at boot
505 * and at resume time. 505 * and at resume time.
506 */ 506 */
507 507
508static void ali_init_chipset(struct pci_dev *pdev) 508static void ali_init_chipset(struct pci_dev *pdev)
509{ 509{
510 u8 rev, tmp; 510 u8 rev, tmp;
@@ -655,7 +655,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
655 port_info[0] = port_info[1] = &info_c5; 655 port_info[0] = port_info[1] = &info_c5;
656 656
657 ali_init_chipset(pdev); 657 ali_init_chipset(pdev);
658 658
659 isa_bridge = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL); 659 isa_bridge = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
660 if (isa_bridge && rev >= 0x20 && rev < 0xC2) { 660 if (isa_bridge && rev >= 0x20 && rev < 0xC2) {
661 /* Are we paired with a UDMA capable chip */ 661 /* Are we paired with a UDMA capable chip */
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 9f165a8e032d..476b87963f5d 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -305,7 +305,7 @@ static void __devexit cs5520_remove_one(struct pci_dev *pdev)
305 * Do any reconfiguration work needed by a resume from RAM. We need 305 * Do any reconfiguration work needed by a resume from RAM. We need
306 * to restore DMA mode support on BIOSen which disabled it 306 * to restore DMA mode support on BIOSen which disabled it
307 */ 307 */
308 308
309static int cs5520_reinit_one(struct pci_dev *pdev) 309static int cs5520_reinit_one(struct pci_dev *pdev)
310{ 310{
311 u8 pcicfg; 311 u8 pcicfg;
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index b1ca207e3545..611d90f0d3bc 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -247,7 +247,7 @@ static int cs5530_is_palmax(void)
247 * Perform the chip initialisation work that is shared between both 247 * Perform the chip initialisation work that is shared between both
248 * setup and resume paths 248 * setup and resume paths
249 */ 249 */
250 250
251static int cs5530_init_chip(void) 251static int cs5530_init_chip(void)
252{ 252{
253 struct pci_dev *master_0 = NULL, *cs5530_0 = NULL, *dev = NULL; 253 struct pci_dev *master_0 = NULL, *cs5530_0 = NULL, *dev = NULL;
@@ -357,11 +357,11 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
357 .port_ops = &cs5530_port_ops 357 .port_ops = &cs5530_port_ops
358 }; 358 };
359 static struct ata_port_info *port_info[2] = { &info, &info }; 359 static struct ata_port_info *port_info[2] = { &info, &info };
360 360
361 /* Chip initialisation */ 361 /* Chip initialisation */
362 if (cs5530_init_chip()) 362 if (cs5530_init_chip())
363 return -ENODEV; 363 return -ENODEV;
364 364
365 if (cs5530_is_palmax()) 365 if (cs5530_is_palmax())
366 port_info[1] = &info_palmax_secondary; 366 port_info[1] = &info_palmax_secondary;
367 367
@@ -376,7 +376,7 @@ static int cs5530_reinit_one(struct pci_dev *pdev)
376 BUG(); 376 BUG();
377 return ata_pci_device_resume(pdev); 377 return ata_pci_device_resume(pdev);
378} 378}
379 379
380static const struct pci_device_id cs5530[] = { 380static const struct pci_device_id cs5530[] = {
381 { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), }, 381 { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), },
382 382
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 2663599a7c02..8cf167e59dee 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -232,7 +232,7 @@ static int hpt36x_pre_reset(struct ata_port *ap)
232 232
233 if (!pci_test_config_bits(pdev, &hpt36x_enable_bits[ap->port_no])) 233 if (!pci_test_config_bits(pdev, &hpt36x_enable_bits[ap->port_no]))
234 return -ENOENT; 234 return -ENOENT;
235 235
236 pci_read_config_byte(pdev, 0x5A, &ata66); 236 pci_read_config_byte(pdev, 0x5A, &ata66);
237 if (ata66 & (1 << ap->port_no)) 237 if (ata66 & (1 << ap->port_no))
238 ap->cbl = ATA_CBL_PATA40; 238 ap->cbl = ATA_CBL_PATA40;
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index dfb306057cf4..3ad0e51cb2ab 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -459,7 +459,7 @@ static int hpt37x_pre_reset(struct ata_port *ap)
459 }; 459 };
460 if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no])) 460 if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
461 return -ENOENT; 461 return -ENOENT;
462 462
463 pci_read_config_byte(pdev, 0x5B, &scr2); 463 pci_read_config_byte(pdev, 0x5B, &scr2);
464 pci_write_config_byte(pdev, 0x5B, scr2 & ~0x01); 464 pci_write_config_byte(pdev, 0x5B, scr2 & ~0x01);
465 /* Cable register now active */ 465 /* Cable register now active */
@@ -504,7 +504,7 @@ static int hpt374_pre_reset(struct ata_port *ap)
504 504
505 if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no])) 505 if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
506 return -ENOENT; 506 return -ENOENT;
507 507
508 /* Do the extra channel work */ 508 /* Do the extra channel work */
509 pci_read_config_word(pdev, 0x52, &mcr3); 509 pci_read_config_word(pdev, 0x52, &mcr3);
510 pci_read_config_word(pdev, 0x56, &mcr6); 510 pci_read_config_word(pdev, 0x56, &mcr6);
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 5f1d385eb592..5caf167e26de 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -164,7 +164,7 @@ static struct ata_port_operations hpt3x3_port_ops = {
164 * 164 *
165 * Perform the setup required at boot and on resume. 165 * Perform the setup required at boot and on resume.
166 */ 166 */
167 167
168static void hpt3x3_init_chipset(struct pci_dev *dev) 168static void hpt3x3_init_chipset(struct pci_dev *dev)
169{ 169{
170 u16 cmd; 170 u16 cmd;
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index d50264af2848..aaf6787f5342 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -221,7 +221,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i
221static int jmicron_reinit_one(struct pci_dev *pdev) 221static int jmicron_reinit_one(struct pci_dev *pdev)
222{ 222{
223 u32 reg; 223 u32 reg;
224 224
225 switch(pdev->device) { 225 switch(pdev->device) {
226 case PCI_DEVICE_ID_JMICRON_JMB368: 226 case PCI_DEVICE_ID_JMICRON_JMB368:
227 break; 227 break;
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 1c810ea00253..af93533551ac 100644
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -45,10 +45,10 @@ static int marvell_pre_reset(struct ata_port *ap)
45 for(i = 0; i <= 0x0F; i++) 45 for(i = 0; i <= 0x0F; i++)
46 printk("%02X:%02X ", i, readb(barp + i)); 46 printk("%02X:%02X ", i, readb(barp + i));
47 printk("\n"); 47 printk("\n");
48 48
49 devices = readl(barp + 0x0C); 49 devices = readl(barp + 0x0C);
50 pci_iounmap(pdev, barp); 50 pci_iounmap(pdev, barp);
51 51
52 if ((pdev->device == 0x6145) && (ap->port_no == 0) && 52 if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
53 (!(devices & 0x10))) /* PATA enable ? */ 53 (!(devices & 0x10))) /* PATA enable ? */
54 return -ENOENT; 54 return -ENOENT;
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index f02b6a3b0f10..80191978d481 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -559,7 +559,7 @@ static int serverworks_reinit_one(struct pci_dev *pdev)
559{ 559{
560 /* Force master latency timer to 64 PCI clocks */ 560 /* Force master latency timer to 64 PCI clocks */
561 pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40); 561 pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40);
562 562
563 switch (pdev->device) 563 switch (pdev->device)
564 { 564 {
565 case PCI_DEVICE_ID_SERVERWORKS_OSB4IDE: 565 case PCI_DEVICE_ID_SERVERWORKS_OSB4IDE:
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index e8dfd8fc3ff7..11da1f5271d5 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -270,7 +270,7 @@ static struct ata_port_operations sil680_port_ops = {
270 * is powered up on boot and when we resume in case we resumed from RAM. 270 * is powered up on boot and when we resume in case we resumed from RAM.
271 * Returns the final clock settings. 271 * Returns the final clock settings.
272 */ 272 */
273 273
274static u8 sil680_init_chip(struct pci_dev *pdev) 274static u8 sil680_init_chip(struct pci_dev *pdev)
275{ 275{
276 u32 class_rev = 0; 276 u32 class_rev = 0;
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 916cedb3d755..c434c4ef4e4b 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -847,7 +847,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
847 struct sis_chipset *chipset = NULL; 847 struct sis_chipset *chipset = NULL;
848 848
849 static struct sis_chipset sis_chipsets[] = { 849 static struct sis_chipset sis_chipsets[] = {
850 850
851 { 0x0968, &sis_info133 }, 851 { 0x0968, &sis_info133 },
852 { 0x0966, &sis_info133 }, 852 { 0x0966, &sis_info133 },
853 { 0x0965, &sis_info133 }, 853 { 0x0965, &sis_info133 },
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index f0b6c3b71429..2addce11000a 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -391,11 +391,11 @@ static struct ata_port_operations via_port_ops_noirq = {
391static void via_config_fifo(struct pci_dev *pdev, unsigned int flags) 391static void via_config_fifo(struct pci_dev *pdev, unsigned int flags)
392{ 392{
393 u8 enable; 393 u8 enable;
394 394
395 /* 0x40 low bits indicate enabled channels */ 395 /* 0x40 low bits indicate enabled channels */
396 pci_read_config_byte(pdev, 0x40 , &enable); 396 pci_read_config_byte(pdev, 0x40 , &enable);
397 enable &= 3; 397 enable &= 3;
398 398
399 if (flags & VIA_SET_FIFO) { 399 if (flags & VIA_SET_FIFO) {
400 static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20}; 400 static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
401 u8 fifo; 401 u8 fifo;
@@ -516,7 +516,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
516 516
517 /* Initialise the FIFO for the enabled channels. */ 517 /* Initialise the FIFO for the enabled channels. */
518 via_config_fifo(pdev, config->flags); 518 via_config_fifo(pdev, config->flags);
519 519
520 /* Clock set up */ 520 /* Clock set up */
521 switch(config->flags & VIA_UDMA) { 521 switch(config->flags & VIA_UDMA) {
522 case VIA_UDMA_NONE: 522 case VIA_UDMA_NONE:
@@ -575,7 +575,7 @@ static int via_reinit_one(struct pci_dev *pdev)
575 u32 timing; 575 u32 timing;
576 struct ata_host *host = dev_get_drvdata(&pdev->dev); 576 struct ata_host *host = dev_get_drvdata(&pdev->dev);
577 const struct via_isa_bridge *config = host->private_data; 577 const struct via_isa_bridge *config = host->private_data;
578 578
579 via_config_fifo(pdev, config->flags); 579 via_config_fifo(pdev, config->flags);
580 580
581 if ((config->flags & VIA_UDMA) == VIA_UDMA_66) { 581 if ((config->flags & VIA_UDMA) == VIA_UDMA_66) {
@@ -590,7 +590,7 @@ static int via_reinit_one(struct pci_dev *pdev)
590 timing &= ~0x80008; 590 timing &= ~0x80008;
591 pci_write_config_dword(pdev, 0x50, timing); 591 pci_write_config_dword(pdev, 0x50, timing);
592 } 592 }
593 return ata_pci_device_resume(pdev); 593 return ata_pci_device_resume(pdev);
594} 594}
595 595
596static const struct pci_device_id via[] = { 596static const struct pci_device_id via[] = {
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 5d1f518e1cc7..022da95a3389 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -5,7 +5,7 @@
5 * Support for the Winbond 83759A when operating in advanced mode. 5 * Support for the Winbond 83759A when operating in advanced mode.
6 * Multichip mode is not currently supported. 6 * Multichip mode is not currently supported.
7 */ 7 */
8 8
9#include <linux/kernel.h> 9#include <linux/kernel.h>
10#include <linux/module.h> 10#include <linux/module.h>
11#include <linux/pci.h> 11#include <linux/pci.h>
@@ -69,7 +69,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
69 int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2); 69 int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2);
70 70
71 reg = winbond_readcfg(winbond->config, 0x81); 71 reg = winbond_readcfg(winbond->config, 0x81);
72 72
73 /* Get the timing data in cycles */ 73 /* Get the timing data in cycles */
74 if (reg & 0x40) /* Fast VLB bus, assume 50MHz */ 74 if (reg & 0x40) /* Fast VLB bus, assume 50MHz */
75 ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000); 75 ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
@@ -80,9 +80,9 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
80 recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F; 80 recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
81 timing = (active << 4) | recovery; 81 timing = (active << 4) | recovery;
82 winbond_writecfg(winbond->config, timing, reg); 82 winbond_writecfg(winbond->config, timing, reg);
83 83
84 /* Load the setup timing */ 84 /* Load the setup timing */
85 85
86 reg = 0x35; 86 reg = 0x35;
87 if (adev->class != ATA_DEV_ATA) 87 if (adev->class != ATA_DEV_ATA)
88 reg |= 0x08; /* FIFO off */ 88 reg |= 0x08; /* FIFO off */
@@ -194,13 +194,13 @@ static __init int winbond_init_one(unsigned long port)
194 winbond_writecfg(port, 0x85, reg); 194 winbond_writecfg(port, 0x85, reg);
195 195
196 reg = winbond_readcfg(port, 0x81); 196 reg = winbond_readcfg(port, 0x81);
197 197
198 if (!(reg & 0x03)) /* Disabled */ 198 if (!(reg & 0x03)) /* Disabled */
199 return 0; 199 return 0;
200 200
201 for (i = 0; i < 2 ; i ++) { 201 for (i = 0; i < 2 ; i ++) {
202 202
203 if (reg & (1 << i)) { 203 if (reg & (1 << i)) {
204 /* 204 /*
205 * Fill in a probe structure first of all 205 * Fill in a probe structure first of all
206 */ 206 */
@@ -217,7 +217,7 @@ static __init int winbond_init_one(unsigned long port)
217 ae.pio_mask = 0x1F; 217 ae.pio_mask = 0x1F;
218 218
219 ae.sht = &winbond_sht; 219 ae.sht = &winbond_sht;
220 220
221 ae.n_ports = 1; 221 ae.n_ports = 1;
222 ae.irq = 14 + i; 222 ae.irq = 14 + i;
223 ae.irq_flags = 0; 223 ae.irq_flags = 0;
@@ -257,7 +257,7 @@ static __init int winbond_init(void)
257 257
258 int ct = 0; 258 int ct = 0;
259 int i; 259 int i;
260 260
261 if (probe_winbond == 0) 261 if (probe_winbond == 0)
262 return -ENODEV; 262 return -ENODEV;
263 263
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index f7a963eb1f02..cbca983165de 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -528,7 +528,7 @@ static void nv_adma_mode(struct ata_port *ap)
528 528
529 if (!(pp->flags & NV_ADMA_PORT_REGISTER_MODE)) 529 if (!(pp->flags & NV_ADMA_PORT_REGISTER_MODE))
530 return; 530 return;
531 531
532 WARN_ON(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE); 532 WARN_ON(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE);
533 533
534 tmp = readw(mmio + NV_ADMA_CTL); 534 tmp = readw(mmio + NV_ADMA_CTL);
@@ -568,7 +568,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
568 /* Subtract 1 since an extra entry may be needed for padding, see 568 /* Subtract 1 since an extra entry may be needed for padding, see
569 libata-scsi.c */ 569 libata-scsi.c */
570 sg_tablesize = LIBATA_MAX_PRD - 1; 570 sg_tablesize = LIBATA_MAX_PRD - 1;
571 571
572 /* Since the legacy DMA engine is in use, we need to disable ADMA 572 /* Since the legacy DMA engine is in use, we need to disable ADMA
573 on the port. */ 573 on the port. */
574 adma_enable = 0; 574 adma_enable = 0;
@@ -580,7 +580,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
580 sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN; 580 sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN;
581 adma_enable = 1; 581 adma_enable = 1;
582 } 582 }
583 583
584 pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &current_reg); 584 pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &current_reg);
585 585
586 if(ap->port_no == 1) 586 if(ap->port_no == 1)
@@ -589,7 +589,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
589 else 589 else
590 config_mask = NV_MCP_SATA_CFG_20_PORT0_EN | 590 config_mask = NV_MCP_SATA_CFG_20_PORT0_EN |
591 NV_MCP_SATA_CFG_20_PORT0_PWB_EN; 591 NV_MCP_SATA_CFG_20_PORT0_PWB_EN;
592 592
593 if(adma_enable) { 593 if(adma_enable) {
594 new_reg = current_reg | config_mask; 594 new_reg = current_reg | config_mask;
595 pp->flags &= ~NV_ADMA_ATAPI_SETUP_COMPLETE; 595 pp->flags &= ~NV_ADMA_ATAPI_SETUP_COMPLETE;
@@ -598,10 +598,10 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
598 new_reg = current_reg & ~config_mask; 598 new_reg = current_reg & ~config_mask;
599 pp->flags |= NV_ADMA_ATAPI_SETUP_COMPLETE; 599 pp->flags |= NV_ADMA_ATAPI_SETUP_COMPLETE;
600 } 600 }
601 601
602 if(current_reg != new_reg) 602 if(current_reg != new_reg)
603 pci_write_config_dword(pdev, NV_MCP_SATA_CFG_20, new_reg); 603 pci_write_config_dword(pdev, NV_MCP_SATA_CFG_20, new_reg);
604 604
605 blk_queue_bounce_limit(sdev->request_queue, bounce_limit); 605 blk_queue_bounce_limit(sdev->request_queue, bounce_limit);
606 blk_queue_segment_boundary(sdev->request_queue, segment_boundary); 606 blk_queue_segment_boundary(sdev->request_queue, segment_boundary);
607 blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize); 607 blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize);
@@ -812,13 +812,13 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
812 handled++; /* irq handled if we got here */ 812 handled++; /* irq handled if we got here */
813 } 813 }
814 } 814 }
815 815
816 if(notifier_clears[0] || notifier_clears[1]) { 816 if(notifier_clears[0] || notifier_clears[1]) {
817 /* Note: Both notifier clear registers must be written 817 /* Note: Both notifier clear registers must be written
818 if either is set, even if one is zero, according to NVIDIA. */ 818 if either is set, even if one is zero, according to NVIDIA. */
819 writel(notifier_clears[0], 819 writel(notifier_clears[0],
820 nv_adma_notifier_clear_block(host->ports[0])); 820 nv_adma_notifier_clear_block(host->ports[0]));
821 writel(notifier_clears[1], 821 writel(notifier_clears[1],
822 nv_adma_notifier_clear_block(host->ports[1])); 822 nv_adma_notifier_clear_block(host->ports[1]));
823 } 823 }
824 824
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index c1e32194b09f..c90fb1319dfe 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -311,7 +311,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
311 pi.flags |= ATA_FLAG_SLAVE_POSS; 311 pi.flags |= ATA_FLAG_SLAVE_POSS;
312 } 312 }
313 break; 313 break;
314 314
315 case 0x0182: 315 case 0x0182:
316 case 0x0183: 316 case 0x0183:
317 pci_read_config_dword ( pdev, 0x6C, &val); 317 pci_read_config_dword ( pdev, 0x6C, &val);
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index d3d5c0d57032..038d49d0f2ab 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -330,7 +330,7 @@ static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
330{ 330{
331 struct ata_probe_ent *probe_ent; 331 struct ata_probe_ent *probe_ent;
332 struct ata_port_info *ppi[2]; 332 struct ata_port_info *ppi[2];
333 333
334 ppi[0] = ppi[1] = &vt6420_port_info; 334 ppi[0] = ppi[1] = &vt6420_port_info;
335 probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); 335 probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
336 if (!probe_ent) 336 if (!probe_ent)