Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a86e1c8 authored by Jingoo Han's avatar Jingoo Han Committed by Tejun Heo
Browse files

ata: use pci_get_drvdata() 



Use the wrapper function for getting the driver data using pci_dev
instead of using dev_get_drvdata() with &pdev->dev, so we can directly
pass a struct pci_dev.  This is a purely cosmetic change.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f6e984e6

drivers/ata/acard-ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static struct pci_driver acard_ahci_pci_driver = { 
#ifdef CONFIG_PM

static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	struct ahci_host_priv *hpriv = host->private_data;

	void __iomem *mmio = hpriv->mmio;

	u32 ctl;
@@ -156,7 +156,7 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg 


static int acard_ahci_pci_device_resume(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

drivers/ata/ahci.c

+2 −2
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 
#ifdef CONFIG_PM

static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	struct ahci_host_priv *hpriv = host->private_data;

	void __iomem *mmio = hpriv->mmio;

	u32 ctl;
@@ -644,7 +644,7 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) 


static int ahci_pci_device_resume(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

drivers/ata/ata_piix.c

+3 −3
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static int piix_broken_suspend(void) 


static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	unsigned long flags;

	int rc = 0;
@@ -1023,7 +1023,7 @@ static int piix_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) 


static int piix_pci_device_resume(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	unsigned long flags;

	int rc;
@@ -1736,7 +1736,7 @@ static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


static void piix_remove_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	struct piix_host_priv *hpriv = host->private_data;



	pci_write_config_dword(pdev, PIIX_IOCFG, hpriv->saved_iocfg);

drivers/ata/pata_ali.c

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
#ifdef CONFIG_PM

static int ali_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

drivers/ata/pata_amd.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
#ifdef CONFIG_PM

static int amd_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);