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)
 
         if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
                 return -ENOENT;
-                
+
         ap->cbl = ATA_CBL_PATA40;
         return ata_std_prereset(ap);
 }
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)
         int rc;
 
         DPRINTK("ENTER\n");
-        
+
         if (ent->irq == 0) {
                 dev_printk(KERN_ERR, dev, "is not available: No interrupt assigned.\n");
                 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 = {
  *      Perform the setup on the device that must be done both at boot
  *      and at resume time.
  */
- 
+
 static void ali_init_chipset(struct pci_dev *pdev)
 {
         u8 rev, tmp;
@@ -655,7 +655,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 port_info[0] = port_info[1] = &info_c5;
 
         ali_init_chipset(pdev);
-        
+
         isa_bridge = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
         if (isa_bridge && rev >= 0x20 && rev < 0xC2) {
                 /* 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)
  *      Do any reconfiguration work needed by a resume from RAM. We need
  *      to restore DMA mode support on BIOSen which disabled it
  */
- 
+
 static int cs5520_reinit_one(struct pci_dev *pdev)
 {
         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)
  *      Perform the chip initialisation work that is shared between both
  *      setup and resume paths
  */
- 
+
 static int cs5530_init_chip(void)
 {
         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)
                 .port_ops = &cs5530_port_ops
         };
         static struct ata_port_info *port_info[2] = { &info, &info };
-        
+
         /* Chip initialisation */
         if (cs5530_init_chip())
                 return -ENODEV;
-                
+
         if (cs5530_is_palmax())
                 port_info[1] = &info_palmax_secondary;
 
@@ -376,7 +376,7 @@ static int cs5530_reinit_one(struct pci_dev *pdev)
                 BUG();
         return ata_pci_device_resume(pdev);
 }
-        
+
 static const struct pci_device_id cs5530[] = {
         { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE), },
 
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)
 
         if (!pci_test_config_bits(pdev, &hpt36x_enable_bits[ap->port_no]))
                 return -ENOENT;
-                
+
         pci_read_config_byte(pdev, 0x5A, &ata66);
         if (ata66 & (1 << ap->port_no))
                 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)
         };
         if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
                 return -ENOENT;
-                
+
         pci_read_config_byte(pdev, 0x5B, &scr2);
         pci_write_config_byte(pdev, 0x5B, scr2 & ~0x01);
         /* Cable register now active */
@@ -504,7 +504,7 @@ static int hpt374_pre_reset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
                 return -ENOENT;
-                
+
         /* Do the extra channel work */
         pci_read_config_word(pdev, 0x52, &mcr3);
         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 = {
  *
  *      Perform the setup required at boot and on resume.
  */
- 
+
 static void hpt3x3_init_chipset(struct pci_dev *dev)
 {
         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
 static int jmicron_reinit_one(struct pci_dev *pdev)
 {
         u32 reg;
-        
+
         switch(pdev->device) {
                 case PCI_DEVICE_ID_JMICRON_JMB368:
                         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)
         for(i = 0; i <= 0x0F; i++)
                 printk("%02X:%02X ", i, readb(barp + i));
         printk("\n");
-        
+
         devices = readl(barp + 0x0C);
         pci_iounmap(pdev, barp);
-        
+
         if ((pdev->device == 0x6145) && (ap->port_no == 0) &&
             (!(devices & 0x10)))        /* PATA enable ? */
                 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)
 {
         /* Force master latency timer to 64 PCI clocks */
         pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40);
-        
+
         switch (pdev->device)
         {
                 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 = {
  *      is powered up on boot and when we resume in case we resumed from RAM.
  *      Returns the final clock settings.
  */
- 
+
 static u8 sil680_init_chip(struct pci_dev *pdev)
 {
         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)
         struct sis_chipset *chipset = NULL;
 
         static struct sis_chipset sis_chipsets[] = {
-        
+
                 { 0x0968, &sis_info133 },
                 { 0x0966, &sis_info133 },
                 { 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 = {
 static void via_config_fifo(struct pci_dev *pdev, unsigned int flags)
 {
         u8 enable;
-        
+
         /* 0x40 low bits indicate enabled channels */
         pci_read_config_byte(pdev, 0x40 , &enable);
         enable &= 3;
-        
+
         if (flags & VIA_SET_FIFO) {
                 static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
                 u8 fifo;
@@ -516,7 +516,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Initialise the FIFO for the enabled channels. */
         via_config_fifo(pdev, config->flags);
-        
+
         /* Clock set up */
         switch(config->flags & VIA_UDMA) {
                 case VIA_UDMA_NONE:
@@ -575,7 +575,7 @@ static int via_reinit_one(struct pci_dev *pdev)
         u32 timing;
         struct ata_host *host = dev_get_drvdata(&pdev->dev);
         const struct via_isa_bridge *config = host->private_data;
-        
+
         via_config_fifo(pdev, config->flags);
 
         if ((config->flags & VIA_UDMA) == VIA_UDMA_66) {
@@ -590,7 +590,7 @@ static int via_reinit_one(struct pci_dev *pdev)
                 timing &= ~0x80008;
                 pci_write_config_dword(pdev, 0x50, timing);
         }
-        return ata_pci_device_resume(pdev);     
+        return ata_pci_device_resume(pdev);
 }
 
 static 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 @@
  *    Support for the Winbond 83759A when operating in advanced mode.
  *    Multichip mode is not currently supported.
  */
- 
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -69,7 +69,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
         int timing = 0x88 + (ap->port_no * 4) + (adev->devno * 2);
 
         reg = winbond_readcfg(winbond->config, 0x81);
-        
+
         /* Get the timing data in cycles */
         if (reg & 0x40)         /* Fast VLB bus, assume 50MHz */
                 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)
         recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
         timing = (active << 4) | recovery;
         winbond_writecfg(winbond->config, timing, reg);
-        
+
         /* Load the setup timing */
-        
+
         reg = 0x35;
         if (adev->class != ATA_DEV_ATA)
                 reg |= 0x08;    /* FIFO off */
@@ -194,13 +194,13 @@ static __init int winbond_init_one(unsigned long port)
         winbond_writecfg(port, 0x85, reg);
 
         reg = winbond_readcfg(port, 0x81);
-        
+
         if (!(reg & 0x03))              /* Disabled */
                 return 0;
 
         for (i = 0; i < 2 ; i ++) {
 
-                if (reg & (1 << i)) {           
+                if (reg & (1 << i)) {
                         /*
                          *      Fill in a probe structure first of all
                          */
@@ -217,7 +217,7 @@ static __init int winbond_init_one(unsigned long port)
                         ae.pio_mask = 0x1F;
 
                         ae.sht = &winbond_sht;
-        
+
                         ae.n_ports = 1;
                         ae.irq = 14 + i;
                         ae.irq_flags = 0;
@@ -257,7 +257,7 @@ static __init int winbond_init(void)
 
         int ct = 0;
         int i;
-        
+
         if (probe_winbond == 0)
                 return -ENODEV;
 
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)
 
         if (!(pp->flags & NV_ADMA_PORT_REGISTER_MODE))
                 return;
-                
+
         WARN_ON(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE);
 
         tmp = readw(mmio + NV_ADMA_CTL);
@@ -568,7 +568,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
                 /* Subtract 1 since an extra entry may be needed for padding, see
                    libata-scsi.c */
                 sg_tablesize = LIBATA_MAX_PRD - 1;
-                
+
                 /* Since the legacy DMA engine is in use, we need to disable ADMA
                    on the port. */
                 adma_enable = 0;
@@ -580,7 +580,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
                 sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN;
                 adma_enable = 1;
         }
-        
+
         pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &current_reg);
 
         if(ap->port_no == 1)
@@ -589,7 +589,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
         else
                 config_mask = NV_MCP_SATA_CFG_20_PORT0_EN |
                               NV_MCP_SATA_CFG_20_PORT0_PWB_EN;
-        
+
         if(adma_enable) {
                 new_reg = current_reg | config_mask;
                 pp->flags &= ~NV_ADMA_ATAPI_SETUP_COMPLETE;
@@ -598,10 +598,10 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
                 new_reg = current_reg & ~config_mask;
                 pp->flags |= NV_ADMA_ATAPI_SETUP_COMPLETE;
         }
-        
+
         if(current_reg != new_reg)
                 pci_write_config_dword(pdev, NV_MCP_SATA_CFG_20, new_reg);
-        
+
         blk_queue_bounce_limit(sdev->request_queue, bounce_limit);
         blk_queue_segment_boundary(sdev->request_queue, segment_boundary);
         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)
                         handled++; /* irq handled if we got here */
                 }
         }
-        
+
         if(notifier_clears[0] || notifier_clears[1]) {
                 /* Note: Both notifier clear registers must be written
                    if either is set, even if one is zero, according to NVIDIA. */
-                writel(notifier_clears[0], 
+                writel(notifier_clears[0],
                         nv_adma_notifier_clear_block(host->ports[0]));
-                writel(notifier_clears[1], 
+                writel(notifier_clears[1],
                         nv_adma_notifier_clear_block(host->ports[1]));
         }
 
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)
                         pi.flags |= ATA_FLAG_SLAVE_POSS;
                 }
                 break;
-        
+
         case 0x0182:
         case 0x0183:
                 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)
 {
         struct ata_probe_ent *probe_ent;
         struct ata_port_info *ppi[2];
-        
+
         ppi[0] = ppi[1] = &vt6420_port_info;
         probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
         if (!probe_ent)