Commit 97cfbfe6 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Jeff Garzik
Browse files

ahci: Get rid of pci_dev argument in ahci_port_init() 



To make the function bus-independand we have to get rid of
"struct pci_dev *", so let's pass just "struct devce *".

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 3303040d

drivers/ata/ahci.c

+3 −4
Original line number Diff line number Diff line
@@ -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);