Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

5 files changed, 14 insertions, 80 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 320df6cd3def..c2c8fa828e24 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -865,22 +865,6 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
         return 0;
 }
 
-/* move to PCI layer, integrate w/ MSI stuff */
-static void pci_intx(struct pci_dev *pdev, int enable)
-{
-        u16 pci_command, new;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-
-        if (enable)
-                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
-        else
-                new = pci_command | PCI_COMMAND_INTX_DISABLE;
-
-        if (new != pci_command)
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-}
-
 static void ahci_print_info(struct ata_probe_ent *probe_ent)
 {
         struct ahci_host_priv *hpriv = probe_ent->private_data;
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 5f8688529041..87e0c36f1554 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -568,18 +568,6 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
         }
 }
 
-/* move to PCI layer, integrate w/ MSI stuff */
-static void pci_enable_intx(struct pci_dev *pdev)
-{
-        u16 pci_command;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-        if (pci_command & PCI_COMMAND_INTX_DISABLE) {
-                pci_command &= ~PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-        }
-}
-
 #define AHCI_PCI_BAR 5
 #define AHCI_GLOBAL_CTL 0x04
 #define AHCI_ENABLE (1 << 31)
@@ -677,7 +665,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
          * message-signalled interrupts currently).
          */
         if (port_info[0]->host_flags & PIIX_FLAG_CHECKINTR)
-                pci_enable_intx(pdev);
+                pci_intx(pdev, 1);
 
         if (combined) {
                 port_info[sata_chan] = &piix_port_info[ent->driver_data];
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index f97e3afa97d9..ea76fe44585e 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -699,22 +699,6 @@ static int mv_host_init(struct ata_probe_ent *probe_ent)
         return rc;
 }
 
-/* move to PCI layer, integrate w/ MSI stuff */
-static void pci_intx(struct pci_dev *pdev, int enable)
-{
-        u16 pci_command, new;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-
-        if (enable)
-                new = pci_command & ~PCI_COMMAND_INTX_DISABLE;
-        else
-                new = pci_command | PCI_COMMAND_INTX_DISABLE;
-
-        if (new != pci_command)
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-}
-
 static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version = 0;
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 7d1aaa99aaae..a63f93186e41 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -55,7 +55,7 @@ enum {
         SIS180_SATA1_OFS        = 0x10, /* offset from sata0->sata1 phy regs */
         SIS182_SATA1_OFS        = 0x20, /* offset from sata0->sata1 phy regs */
         SIS_PMR                 = 0x90, /* port mapping register */
-        SIS_PMR_COMBINED        = 0x30, 
+        SIS_PMR_COMBINED        = 0x30,
 
         /* random bits */
         SIS_FLAG_CFGSCR         = (1 << 30), /* host flag: SCRs via PCI cfg */
@@ -147,11 +147,13 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg,
 {
         unsigned int addr = SIS_SCR_BASE + (4 * sc_reg);
 
-        if (port_no) 
+        if (port_no)  {
                 if (device == 0x182)
                         addr += SIS182_SATA1_OFS;
                 else
                         addr += SIS180_SATA1_OFS;
+        }
+
         return addr;
 }
 
@@ -166,10 +168,10 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
                 return 0xffffffff;
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
-        
+
         pci_read_config_dword(pdev, cfg_addr, &val);
 
-        if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED)) 
+        if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED))
                 pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
 
         return val|val2;
@@ -185,7 +187,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
                 return;
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
-        
+
         pci_write_config_dword(pdev, cfg_addr, val);
 
         if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED))
@@ -195,7 +197,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
 static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
 {
         struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
-        u32 val,val2;
+        u32 val, val2 = 0;
         u8 pmr;
 
         if (sc_reg > SCR_CONTROL)
@@ -209,9 +211,9 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
         val = inl(ap->ioaddr.scr_addr + (sc_reg * 4));
 
         if ((pdev->device == 0x182) || (pmr & SIS_PMR_COMBINED))
-                val2 = inl(ap->ioaddr.scr_addr + (sc_reg * 4)+0x10);
+                val2 = inl(ap->ioaddr.scr_addr + (sc_reg * 4) + 0x10);
 
-        return val|val2;
+        return val | val2;
 }
 
 static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
@@ -223,7 +225,7 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
                 return;
 
         pci_read_config_byte(pdev, SIS_PMR, &pmr);
-        
+
         if (ap->flags & SIS_FLAG_CFGSCR)
                 sis_scr_cfg_write(ap, sc_reg, val);
         else {
@@ -233,18 +235,6 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
         }
 }
 
-/* move to PCI layer, integrate w/ MSI stuff */
-static void pci_enable_intx(struct pci_dev *pdev)
-{
-        u16 pci_command;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-        if (pci_command & PCI_COMMAND_INTX_DISABLE) {
-                pci_command &= ~PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-        }
-}
-
 static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct ata_probe_ent *probe_ent = NULL;
@@ -319,7 +309,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         pci_set_master(pdev);
-        pci_enable_intx(pdev);
+        pci_intx(pdev, 1);
 
         /* FIXME: check ata_device_add return value */
         ata_device_add(probe_ent);
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 42e13ed8eb5b..4c9fb8b71be1 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -176,18 +176,6 @@ static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
         uli_scr_cfg_write(ap, sc_reg, val);
 }
 
-/* move to PCI layer, integrate w/ MSI stuff */
-static void pci_enable_intx(struct pci_dev *pdev)
-{
-        u16 pci_command;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
-        if (pci_command & PCI_COMMAND_INTX_DISABLE) {
-                pci_command &= ~PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(pdev, PCI_COMMAND, pci_command);
-        }
-}
-
 static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct ata_probe_ent *probe_ent;
@@ -260,7 +248,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         pci_set_master(pdev);
-        pci_enable_intx(pdev);
+        pci_intx(pdev, 1);
 
         /* FIXME: check ata_device_add return value */
         ata_device_add(probe_ent);