Skip to content

Commit

Permalink
Rename SMSC phy functions to be more generic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steve Glendinning authored and Jeff Garzik committed Apr 29, 2008
1 parent 5d12b13 commit 48c41b9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/phy/smsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4)


static int lan83c185_config_intr(struct phy_device *phydev)
static int smsc_phy_config_intr(struct phy_device *phydev)
{
int rc = phy_write (phydev, MII_LAN83C185_IM,
((PHY_INTERRUPT_ENABLED == phydev->interrupts)
Expand All @@ -48,16 +48,16 @@ static int lan83c185_config_intr(struct phy_device *phydev)
return rc < 0 ? rc : 0;
}

static int lan83c185_ack_interrupt(struct phy_device *phydev)
static int smsc_phy_ack_interrupt(struct phy_device *phydev)
{
int rc = phy_read (phydev, MII_LAN83C185_ISF);

return rc < 0 ? rc : 0;
}

static int lan83c185_config_init(struct phy_device *phydev)
static int smsc_phy_config_init(struct phy_device *phydev)
{
return lan83c185_ack_interrupt (phydev);
return smsc_phy_ack_interrupt (phydev);
}


Expand All @@ -73,11 +73,11 @@ static struct phy_driver lan83c185_driver = {
/* basic functions */
.config_aneg = genphy_config_aneg,
.read_status = genphy_read_status,
.config_init = lan83c185_config_init,
.config_init = smsc_phy_config_init,

/* IRQ related */
.ack_interrupt = lan83c185_ack_interrupt,
.config_intr = lan83c185_config_intr,
.ack_interrupt = smsc_phy_ack_interrupt,
.config_intr = smsc_phy_config_intr,

.driver = { .owner = THIS_MODULE, }
};
Expand Down

0 comments on commit 48c41b9

Please sign in to comment.