|
@@ -4113,8 +4113,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
|
|
@@ -4132,7 +4131,7 @@ static int __devexit mv_platform_remove(struct platform_device *pdev)
|
|
|
#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
|
|
@@ -4141,7 +4140,7 @@ static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state)
|
|
|
|
|
|
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) {
|
|
@@ -4356,7 +4355,7 @@ static int mv_pci_init_one(struct pci_dev *pdev,
|
|
|
#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);
|