From 8cd5bf5b69b037ac35f50a65aac246e5039fb571 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Mon, 3 Dec 2012 10:34:41 -0800 Subject: [PATCH] --- yaml --- r: 344435 b: refs/heads/master c: 04a3f5b7d2961a05b428abc75b30e2dc85f88ac6 h: refs/heads/master i: 344433: 015c635b7584b0c675ced01294da989f3c461e0b 344431: 5e30950675206556058084c399bd227c082ea004 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 64eb8323782e..21836a9d4c8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1645bf1b51e5788a18cb6af7cfbb221ee17a6e8b +refs/heads/master: 04a3f5b7d2961a05b428abc75b30e2dc85f88ac6 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 8e3f4a90c088..47d59616fe3d 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -6287,8 +6287,7 @@ void ata_host_detach(struct ata_host *host) */ void ata_pci_remove_one(struct pci_dev *pdev) { - struct device *dev = &pdev->dev; - struct ata_host *host = dev_get_drvdata(dev); + struct ata_host *host = pci_get_drvdata(pdev); ata_host_detach(host); } @@ -6357,7 +6356,7 @@ int ata_pci_device_do_resume(struct pci_dev *pdev) int ata_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); int rc = 0; rc = ata_host_suspend(host, mesg); @@ -6371,7 +6370,7 @@ int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg) int ata_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);