ahci: Get rid of pci_dev argument in ahci_port_init()

[lisovros/linux_canprio.git] / drivers / ata / ahci.c

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 189b97c9f0ece2ddffc275865b5dff7454b3f3e9..d75b7c9ea32356bbf4dc0609fc6a42ad1113bd7b 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1654,7 +1654,7 @@ static ssize_t ahci_activity_show(struct ata_device *dev, char *buf)
        return sprintf(buf, "%d\n", emp->blink_policy);
 }
 
-static void ahci_port_init(struct pci_dev *pdev, struct ata_port *ap,
+static void ahci_port_init(struct device *dev, struct ata_port *ap,
                           int port_no, void __iomem *mmio,
                           void __iomem *port_mmio)
 {
@@ -1665,8 +1665,7 @@ static void ahci_port_init(struct pci_dev *pdev, struct ata_port *ap,
        /* 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);
+               dev_warn(dev, "%s (%d)\n", emsg, rc);
 
        /* clear SError */
        tmp = readl(port_mmio + PORT_SCR_ERR);
@@ -1715,7 +1714,7 @@ static void ahci_init_controller(struct ata_host *host)
                if (ata_port_is_dummy(ap))
                        continue;
 
-               ahci_port_init(pdev, ap, i, mmio, port_mmio);
+               ahci_port_init(host->dev, ap, i, mmio, port_mmio);
        }
 
        tmp = readl(mmio + HOST_CTL);