Merge tag 'xtensa-next-20130710' of git://github.com/czankel/xtensa-linux

[karo-tx-linux.git] / drivers / ata / pata_bf54x.c

diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 8d43510c6becbb14a2e66ae54b92200c568af96a..ba0d8a29dc235ab33de62e5e9eb233afcba47a83 100644 (file)
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1596,7 +1596,7 @@ static int bfin_atapi_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       dev_set_drvdata(&pdev->dev, host);
+       platform_set_drvdata(pdev, host);
 
        return 0;
 }
@@ -1610,11 +1610,9 @@ static int bfin_atapi_probe(struct platform_device *pdev)
  */
 static int bfin_atapi_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);
 
        ata_host_detach(host);
-       dev_set_drvdata(&pdev->dev, NULL);
 
        peripheral_free_list(atapi_io_port);
 
@@ -1624,7 +1622,7 @@ static int bfin_atapi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_atapi_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
@@ -1633,7 +1631,7 @@ static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int bfin_atapi_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) {