diff options
-rw-r--r-- | drivers/ata/ahci.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 189b97c9f0ec..d75b7c9ea323 100644 --- 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) | |||
1654 | return sprintf(buf, "%d\n", emp->blink_policy); | 1654 | return sprintf(buf, "%d\n", emp->blink_policy); |
1655 | } | 1655 | } |
1656 | 1656 | ||
1657 | static void ahci_port_init(struct pci_dev *pdev, struct ata_port *ap, | 1657 | static void ahci_port_init(struct device *dev, struct ata_port *ap, |
1658 | int port_no, void __iomem *mmio, | 1658 | int port_no, void __iomem *mmio, |
1659 | void __iomem *port_mmio) | 1659 | void __iomem *port_mmio) |
1660 | { | 1660 | { |
@@ -1665,8 +1665,7 @@ static void ahci_port_init(struct pci_dev *pdev, struct ata_port *ap, | |||
1665 | /* make sure port is not active */ | 1665 | /* make sure port is not active */ |
1666 | rc = ahci_deinit_port(ap, &emsg); | 1666 | rc = ahci_deinit_port(ap, &emsg); |
1667 | if (rc) | 1667 | if (rc) |
1668 | dev_printk(KERN_WARNING, &pdev->dev, | 1668 | dev_warn(dev, "%s (%d)\n", emsg, rc); |
1669 | "%s (%d)\n", emsg, rc); | ||
1670 | 1669 | ||
1671 | /* clear SError */ | 1670 | /* clear SError */ |
1672 | tmp = readl(port_mmio + PORT_SCR_ERR); | 1671 | tmp = readl(port_mmio + PORT_SCR_ERR); |
@@ -1715,7 +1714,7 @@ static void ahci_init_controller(struct ata_host *host) | |||
1715 | if (ata_port_is_dummy(ap)) | 1714 | if (ata_port_is_dummy(ap)) |
1716 | continue; | 1715 | continue; |
1717 | 1716 | ||
1718 | ahci_port_init(pdev, ap, i, mmio, port_mmio); | 1717 | ahci_port_init(host->dev, ap, i, mmio, port_mmio); |
1719 | } | 1718 | } |
1720 | 1719 | ||
1721 | tmp = readl(mmio + HOST_CTL); | 1720 | tmp = readl(mmio + HOST_CTL); |