diff options
author | Steve Glendinning <steve.glendinning@smsc.com> | 2008-04-28 13:36:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-29 01:55:57 -0400 |
commit | 48c41b9941233a85ccdb88c579bd4e9b0ee609cf (patch) | |
tree | 5ac07c2617bcca147ba9a725032eab31e8949eb5 /drivers | |
parent | 5d12b132bc0bfb10d3f8d81f92606719b5032dcb (diff) |
Rename SMSC phy functions to be more generic
Several models of SMSC PHY have the same interrupt status and mask
registers as the LAN83C185, so these functions can service multiple
different PHY drivers.
Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/phy/smsc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index b1d8ed40ad98..6a901f00ed14 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c | |||
@@ -38,7 +38,7 @@ | |||
38 | (MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4) | 38 | (MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4) |
39 | 39 | ||
40 | 40 | ||
41 | static int lan83c185_config_intr(struct phy_device *phydev) | 41 | static int smsc_phy_config_intr(struct phy_device *phydev) |
42 | { | 42 | { |
43 | int rc = phy_write (phydev, MII_LAN83C185_IM, | 43 | int rc = phy_write (phydev, MII_LAN83C185_IM, |
44 | ((PHY_INTERRUPT_ENABLED == phydev->interrupts) | 44 | ((PHY_INTERRUPT_ENABLED == phydev->interrupts) |
@@ -48,16 +48,16 @@ static int lan83c185_config_intr(struct phy_device *phydev) | |||
48 | return rc < 0 ? rc : 0; | 48 | return rc < 0 ? rc : 0; |
49 | } | 49 | } |
50 | 50 | ||
51 | static int lan83c185_ack_interrupt(struct phy_device *phydev) | 51 | static int smsc_phy_ack_interrupt(struct phy_device *phydev) |
52 | { | 52 | { |
53 | int rc = phy_read (phydev, MII_LAN83C185_ISF); | 53 | int rc = phy_read (phydev, MII_LAN83C185_ISF); |
54 | 54 | ||
55 | return rc < 0 ? rc : 0; | 55 | return rc < 0 ? rc : 0; |
56 | } | 56 | } |
57 | 57 | ||
58 | static int lan83c185_config_init(struct phy_device *phydev) | 58 | static int smsc_phy_config_init(struct phy_device *phydev) |
59 | { | 59 | { |
60 | return lan83c185_ack_interrupt (phydev); | 60 | return smsc_phy_ack_interrupt (phydev); |
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
@@ -73,11 +73,11 @@ static struct phy_driver lan83c185_driver = { | |||
73 | /* basic functions */ | 73 | /* basic functions */ |
74 | .config_aneg = genphy_config_aneg, | 74 | .config_aneg = genphy_config_aneg, |
75 | .read_status = genphy_read_status, | 75 | .read_status = genphy_read_status, |
76 | .config_init = lan83c185_config_init, | 76 | .config_init = smsc_phy_config_init, |
77 | 77 | ||
78 | /* IRQ related */ | 78 | /* IRQ related */ |
79 | .ack_interrupt = lan83c185_ack_interrupt, | 79 | .ack_interrupt = smsc_phy_ack_interrupt, |
80 | .config_intr = lan83c185_config_intr, | 80 | .config_intr = smsc_phy_config_intr, |
81 | 81 | ||
82 | .driver = { .owner = THIS_MODULE, } | 82 | .driver = { .owner = THIS_MODULE, } |
83 | }; | 83 | }; |