[PATCH] PCI/libata INTx cleanup

Simple cleanup to eliminate X copies of the pci_enable_intx() function
in libata.  Moved ahci.c's pci_intx() to pci.c and use it throughout
libata and msi.c.

Signed-off-by: Brett Russ <russb@emc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

6 files changed, 31 insertions, 63 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 532f73bb2224..ee8677bda950 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -439,10 +439,7 @@ static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
         }
         if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
                 /* PCI Express Endpoint device detected */
-                u16 cmd;
-                pci_read_config_word(dev, PCI_COMMAND, &cmd);
-                cmd |= PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
+                pci_intx(dev, 0);  /* disable intx */
         }
 }
 
@@ -461,10 +458,7 @@ void disable_msi_mode(struct pci_dev *dev, int pos, int type)
         }
         if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
                 /* PCI Express Endpoint device detected */
-                u16 cmd;
-                pci_read_config_word(dev, PCI_COMMAND, &cmd);
-                cmd &= ~PCI_COMMAND_INTX_DISABLE;
-                pci_write_config_word(dev, PCI_COMMAND, cmd);
+                pci_intx(dev, 1);  /* enable intx */
         }
 }
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e179af3186f5..ccff633a3948 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -798,6 +798,31 @@ pci_clear_mwi(struct pci_dev *dev)
         }
 }
 
+/**
+ * pci_intx - enables/disables PCI INTx for device dev
+ * @dev: the PCI device to operate on
+ * @enable: boolean
+ *
+ * Enables/disables PCI INTx for device dev
+ */
+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);
+        }
+}
+
 #ifndef HAVE_ARCH_PCI_SET_DMA_MASK
 /*
  * These can be overridden by arch-specific implementations
@@ -875,6 +900,7 @@ EXPORT_SYMBOL(pci_request_region);
 EXPORT_SYMBOL(pci_set_master);
 EXPORT_SYMBOL(pci_set_mwi);
 EXPORT_SYMBOL(pci_clear_mwi);
+EXPORT_SYMBOL_GPL(pci_intx);
 EXPORT_SYMBOL(pci_set_dma_mask);
 EXPORT_SYMBOL(pci_set_consistent_dma_mask);
 EXPORT_SYMBOL(pci_assign_resource);
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_sis.c b/drivers/scsi/sata_sis.c
index 7d1aaa99aaae..2bd3f11ac010 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -233,18 +233,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 +307,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);