Patchwork : jme: Fix warnings with CONFIG_PM disabled.

login
register
mail settings
Submitter David Miller
Date Oct. 9, 2008, 2:55 a.m.
Message ID <20081008.195524.235036900.davem@davemloft.net>
Download mbox | patch
Permalink /patch/3440/
State Accepted
Headers show

Comments

David Miller - Oct. 9, 2008, 2:55 a.m.
I just added the following warning fix to net-next-2.6

jme: Fix warnings with CONFIG_PM disabled.

drivers/net/jme.c:1598: warning: ‘jme_set_100m_half’ defined but not used
drivers/net/jme.c:1618: warning: ‘jme_wait_link’ defined but not used

Signed-off-by: David S. Miller <davem@davemloft.net>

---
 drivers/net/jme.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

-- 
1.5.6.5
Guo-Fu Tseng - Oct. 9, 2008, 5:07 a.m.
Got it, sorry for mistake.
Thank you for super fast applying the patches. 

--
Guo-Fu Tseng

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/jme.c b/drivers/net/jme.c

index 3ab2442..5f9a131 100644

--- a/drivers/net/jme.c

+++ b/drivers/net/jme.c

@@ -1593,6 +1593,7 @@  err_out:

 	return rc;
 }
 
+#ifdef CONFIG_PM

 static void
 jme_set_100m_half(struct jme_adapter *jme)
 {
@@ -1625,6 +1626,7 @@  jme_wait_link(struct jme_adapter *jme)

 		phylink = jme_linkstat_from_phy(jme);
 	}
 }
+#endif

 
 static inline void
 jme_phy_off(struct jme_adapter *jme)
@@ -2912,6 +2914,7 @@  jme_remove_one(struct pci_dev *pdev)

 
 }
 
+#ifdef CONFIG_PM

 static int
 jme_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2991,6 +2994,7 @@  jme_resume(struct pci_dev *pdev)

 
 	return 0;
 }
+#endif

 
 static struct pci_device_id jme_pci_tbl[] = {
 	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) },