diff options
author | Joe Perches <joe@perches.com> | 2012-06-09 03:49:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-11 19:58:24 -0400 |
commit | 8d242488ce4627dd7e6333caab56df11ea25e239 (patch) | |
tree | 61d464de218ba9cb22d15735a54b49d230068c16 /drivers/net/phy/national.c | |
parent | de74e92aa8a44d0b80a53601dc4f6dd6afcb8453 (diff) |
phy: Use pr_<level>
Use a more current logging style.
Add pr_fmt and missing newlines.
Remove embedded prefixes.
Neaten phy_print_status to avoid using KERN_CONT.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/national.c')
-rw-r--r-- | drivers/net/phy/national.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/phy/national.c b/drivers/net/phy/national.c index 04bb8fcc0cb5..9a5f234d95b0 100644 --- a/drivers/net/phy/national.c +++ b/drivers/net/phy/national.c | |||
@@ -15,6 +15,8 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
19 | |||
18 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
19 | #include <linux/module.h> | 21 | #include <linux/module.h> |
20 | #include <linux/mii.h> | 22 | #include <linux/mii.h> |
@@ -22,6 +24,8 @@ | |||
22 | #include <linux/phy.h> | 24 | #include <linux/phy.h> |
23 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
24 | 26 | ||
27 | #define DEBUG | ||
28 | |||
25 | /* DP83865 phy identifier values */ | 29 | /* DP83865 phy identifier values */ |
26 | #define DP83865_PHY_ID 0x20005c7a | 30 | #define DP83865_PHY_ID 0x20005c7a |
27 | 31 | ||
@@ -112,8 +116,8 @@ static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable) | |||
112 | ns_exp_write(phydev, 0x1c0, | 116 | ns_exp_write(phydev, 0x1c0, |
113 | ns_exp_read(phydev, 0x1c0) & 0xfffe); | 117 | ns_exp_read(phydev, 0x1c0) & 0xfffe); |
114 | 118 | ||
115 | printk(KERN_DEBUG "DP83865 PHY: 10BASE-T HDX loopback %s\n", | 119 | pr_debug("10BASE-T HDX loopback %s\n", |
116 | (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); | 120 | (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on"); |
117 | } | 121 | } |
118 | 122 | ||
119 | static int ns_config_init(struct phy_device *phydev) | 123 | static int ns_config_init(struct phy_device *phydev) |