commit 496a34c2249fecc87ee689eede2bb8510c1b37a9
author Bryan Wu <bryan.wu@analog.com> Wed Sep 19 23:37:14 2007 +0800
committer David S. Miller <davem@sunset.davemloft.net> Wed Oct 10 16:51:49 2007 -0700
tree fb5fafab93bbde36c0e7be2bce04749ca4ffc23b
parent 73f83182862a2c9113421720997c75ee939902f8

Blackfin EMAC driver: add power management interface and change the bf537mac_reset to bf537mac_disable

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

drivers/net/bfin_mac.c

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index ead7be96..5cb4433 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -672,7 +672,7 @@
 }
 #endif				/* CONFIG_NET_POLL_CONTROLLER */
 
-static void bf537mac_reset(void)
+static void bf537mac_disable(void)
 {
 	unsigned int opmode;
 
@@ -730,7 +730,7 @@
 {
 	pr_debug("%s: %s\n", dev->name, __FUNCTION__);
 
-	bf537mac_reset();
+	bf537mac_disable();
 
 	/* reset tx queue */
 	tx_list_tail = tx_list_head->next;
@@ -810,7 +810,7 @@
 
 	bf537mac_setphy(dev);
 	setup_system_regs(dev);
-	bf537mac_reset();
+	bf537mac_disable();
 	bf537mac_enable(dev);
 
 	pr_debug("hardware init finished\n");
@@ -968,15 +968,30 @@
 	return 0;
 }
 
-static int bfin_mac_suspend(struct platform_device *pdev, pm_message_t state)
+#ifdef CONFIG_PM
+static int bfin_mac_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
+	struct net_device *net_dev = platform_get_drvdata(pdev);
+
+	if (netif_running(net_dev))
+		bf537mac_close(net_dev);
+
 	return 0;
 }
 
 static int bfin_mac_resume(struct platform_device *pdev)
 {
+	struct net_device *net_dev = platform_get_drvdata(pdev);
+
+	if (netif_running(net_dev))
+		bf537mac_open(net_dev);
+
 	return 0;
 }
+#else
+#define bfin_mac_suspend NULL
+#define bfin_mac_resume NULL
+#endif	/* CONFIG_PM */
 
 static struct platform_driver bfin_mac_driver = {
 	.probe = bfin_mac_probe,