Patchwork [2/2] sata_mv: use {platform|pci}_get_drvdata()

login
register
mail settings
Submitter Sergei Shtylyov
Date Oct. 7, 2011, 3:24 p.m.
Message ID <201110071924.22270.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/118334/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Sergei Shtylyov - Oct. 7, 2011, 3:24 p.m.
The driver uses dev_get_drvdata() to get to the driver data for the platform and
PCI devices, while the corresponding wrappers exists for them -- in one case it
even declares an otherwise unneeded variable  to do that.  Switch to using the
{platform|pci}_get_drvdata() instead.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

---
 drivers/ata/sata_mv.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/ata/sata_mv.c
===================================================================
--- linux-2.6.orig/drivers/ata/sata_mv.c
+++ linux-2.6/drivers/ata/sata_mv.c
@@ -4110,8 +4110,7 @@  err:
  */
 static int __devexit mv_platform_remove(struct platform_device *pdev)
 {
-	struct device *dev = &pdev->dev;
-	struct ata_host *host = dev_get_drvdata(dev);
+	struct ata_host *host = platform_get_drvdata(pdev);
 #if defined(CONFIG_HAVE_CLK)
 	struct mv_host_priv *hpriv = host->private_data;
 #endif
@@ -4129,7 +4128,7 @@  static int __devexit mv_platform_remove(
 #ifdef CONFIG_PM
 static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state)
 {
-	struct ata_host *host = dev_get_drvdata(&pdev->dev);
+	struct ata_host *host = platform_get_drvdata(pdev);
 	if (host)
 		return ata_host_suspend(host, state);
 	else
@@ -4138,7 +4137,7 @@  static int mv_platform_suspend(struct pl
 
 static int mv_platform_resume(struct platform_device *pdev)
 {
-	struct ata_host *host = dev_get_drvdata(&pdev->dev);
+	struct ata_host *host = platform_get_drvdata(pdev);
 	int ret;
 
 	if (host) {
@@ -4353,7 +4352,7 @@  static int mv_pci_init_one(struct pci_de
 #ifdef CONFIG_PM
 static int mv_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);