libata: blackfin Pata Driver: Add proper PM operation into ATAPI driver
PATCH 1/3 libata: blackfin Pata Driver: Add proper PM operation into ATAPI driver
From: Sonic Zhang <[email protected]>
[[email protected]: remove ifdefs, make things static]
Signed-off-by Sonic Zhang <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/ata/pata_bf54x.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)
drivers/ata/pata_bf54x.c renamed from drivers/ata/pata_bf54x.c~libata-blackfin-pata-driver-add-proper-pm-operation-into-atapi-driver +27 -7
@@ -1632,6 +1632,8 @@ static int __devinit bfin_atapi_probe(streturn -ENODEV ; } +dev_set_drvdata (&pdev->dev, host); +return 0 ; }
@@ -1648,6 +1650,7 @@ static int __devexit bfin_atapi_remove(sstruct 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(s }#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) { -return 0 ; +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 }, };
_
Quoted 11 lines · [email protected] wrote:
From: Sonic Zhang <[email protected]>
[[email protected]: remove ifdefs, make things static]Signed-off-by Sonic Zhang <[email protected]>Signed-off-by Bryan Wu <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/ata/pata_bf54x.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-)
applied 1-3