1 files changed, 30 insertions, 20 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f55c9e746b73..4f2c05ef1f09 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -814,39 +814,49 @@ static int ahci_reset_controller(struct ata_host *host)
         return 0;
 }
 
+static void ahci_port_init(struct pci_dev *pdev, struct ata_port *ap,
+                           int port_no, void __iomem *mmio,
+                           void __iomem *port_mmio)
+{
+        const char *emsg = NULL;
+        int rc;
+        u32 tmp;
+
+        /* make sure port is not active */
+        rc = ahci_deinit_port(ap, &emsg);
+        if (rc)
+                dev_printk(KERN_WARNING, &pdev->dev,
+                           "%s (%d)\n", emsg, rc);
+
+        /* clear SError */
+        tmp = readl(port_mmio + PORT_SCR_ERR);
+        VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);
+        writel(tmp, port_mmio + PORT_SCR_ERR);
+
+        /* clear port IRQ */
+        tmp = readl(port_mmio + PORT_IRQ_STAT);
+        VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
+        if (tmp)
+                writel(tmp, port_mmio + PORT_IRQ_STAT);
+
+        writel(1 << port_no, mmio + HOST_IRQ_STAT);
+}
+
 static void ahci_init_controller(struct ata_host *host)
 {
         struct pci_dev *pdev = to_pci_dev(host->dev);
         void __iomem *mmio = host->iomap[AHCI_PCI_BAR];
-        int i, rc;
+        int i;
         u32 tmp;
 
         for (i = 0; i < host->n_ports; i++) {
                 struct ata_port *ap = host->ports[i];
                 void __iomem *port_mmio = ahci_port_base(ap);
-                const char *emsg = NULL;
 
                 if (ata_port_is_dummy(ap))
                         continue;
 
-                /* make sure port is not active */
-                rc = ahci_deinit_port(ap, &emsg);
-                if (rc)
-                        dev_printk(KERN_WARNING, &pdev->dev,
-                                   "%s (%d)\n", emsg, rc);
-
-                /* clear SError */
-                tmp = readl(port_mmio + PORT_SCR_ERR);
-                VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);
-                writel(tmp, port_mmio + PORT_SCR_ERR);
-
-                /* clear port IRQ */
-                tmp = readl(port_mmio + PORT_IRQ_STAT);
-                VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);
-                if (tmp)
-                        writel(tmp, port_mmio + PORT_IRQ_STAT);
-
-                writel(1 << i, mmio + HOST_IRQ_STAT);
+                ahci_port_init(pdev, ap, i, mmio, port_mmio);
         }
 
         tmp = readl(mmio + HOST_CTL);