Title: [5235] trunk/drivers/ata/pata_bf54x.c: Task[#2424] Update PM for ATAPI driver according to LKML feedback.
Revision
5235
Author
sonicz
Date
2008-09-03 21:34:39 -0500 (Wed, 03 Sep 2008)

Log Message

Task[#2424] Update PM for ATAPI driver according to LKML feedback.

Modified Paths

Diff

Modified: trunk/drivers/ata/pata_bf54x.c (5234 => 5235)


--- trunk/drivers/ata/pata_bf54x.c	2008-09-03 11:13:57 UTC (rev 5234)
+++ trunk/drivers/ata/pata_bf54x.c	2008-09-04 02:34:39 UTC (rev 5235)
@@ -1658,7 +1658,7 @@
 }
 
 #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)
@@ -1667,7 +1667,7 @@
 		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;
@@ -1683,15 +1683,16 @@
 
 	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),
-#ifdef CONFIG_PM
 	.suspend		= bfin_atapi_suspend,
 	.resume			= bfin_atapi_resume,
-#endif
 	.driver = {
 		.name		= DRV_NAME,
 		.owner		= THIS_MODULE,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to