aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.h
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2011-06-28 01:38:30 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-30 22:13:16 -0700
commitbc057e0366cad58e55038a2cb69572d51c40cdf3 (patch)
tree741298ce8b3b4031a8a10933c1261825ad1e53f3 /drivers/net/jme.h
parentjme: Fix compile warning introduced by new pm macro (diff)
downloadlinux-dev-bc057e0366cad58e55038a2cb69572d51c40cdf3.tar.xz
linux-dev-bc057e0366cad58e55038a2cb69572d51c40cdf3.zip
jme: Cleanup PM operations after using new PM API
1. Using enum name instead of numeric value. 2. device_set_wakeup_enable expect bool argument adding !!() to the argument to be passed. 3. Remove non-jme-hardware related operations from jme_clear_pm() 4. Reuse jme_clear_pm() in jme_resume() and jme_powersave_phy() Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r--drivers/net/jme.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index 0d5da06489d8..1481a62a1f36 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -852,6 +852,7 @@ enum jme_ghc_txmac_clk {
* Power management control and status register
*/
enum jme_pmcs_bit_masks {
+ PMCS_STMASK = 0xFFFF0000,
PMCS_WF7DET = 0x80000000,
PMCS_WF6DET = 0x40000000,
PMCS_WF5DET = 0x20000000,
@@ -863,6 +864,7 @@ enum jme_pmcs_bit_masks {
PMCS_LFDET = 0x00040000,
PMCS_LRDET = 0x00020000,
PMCS_MFDET = 0x00010000,
+ PMCS_ENMASK = 0x0000FFFF,
PMCS_WF7EN = 0x00008000,
PMCS_WF6EN = 0x00004000,
PMCS_WF5EN = 0x00002000,