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

Commit 67e3e221 authored by Sonic Zhang's avatar Sonic Zhang Committed by Jeff Garzik
Browse files

[libata] pata_bf54x: Add proper PM operation 



[akpm@linux-foundation.org: remove ifdefs, make things static]
Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 47d692a9

drivers/ata/pata_bf54x.c

+27 −7
Original line number Diff line number Diff line
@@ -1632,6 +1632,8 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	dev_set_drvdata(&pdev->dev, host);



	return 0;

}
@@ -1648,6 +1650,7 @@ static int __devexit bfin_atapi_remove(struct platform_device *pdev) 
	struct ata_host *host = dev_get_drvdata(dev);



	ata_host_detach(host);

	dev_set_drvdata(&pdev->dev, NULL);



	peripheral_free_list(atapi_io_port);
@@ -1655,27 +1658,44 @@ static int __devexit bfin_atapi_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)

static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)

{

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

	if (host)

		return ata_host_suspend(host, state);

	else

		return 0;

}



int bfin_atapi_resume(struct platform_device *pdev)

static int bfin_atapi_resume(struct platform_device *pdev)

{

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

	int ret;



	if (host) {

		ret = bfin_reset_controller(host);

		if (ret) {

			printk(KERN_ERR DRV_NAME ": Error during HW init\n");

			return ret;

		}

		ata_host_resume(host);

	}



	return 0;

}

#else

#define bfin_atapi_suspend NULL

#define bfin_atapi_resume NULL

#endif



static struct platform_driver bfin_atapi_driver = {

	.probe			= bfin_atapi_probe,

	.remove			= __devexit_p(bfin_atapi_remove),

	.suspend		= bfin_atapi_suspend,

	.resume			= bfin_atapi_resume,

	.driver = {

		.name		= DRV_NAME,

		.owner		= THIS_MODULE,

#ifdef CONFIG_PM

		.suspend	= bfin_atapi_suspend,

		.resume		= bfin_atapi_resume,

#endif

	},

};