Commit 1210dde7 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

net/au1000_eth.c MDIO namespace fixes

Commit 2e888103


(phylib: add mdiobus_{read,write}) causes the
following compile error:

<--  snip  -->

...
  CC      drivers/net/au1000_eth.o
drivers/net/au1000_eth.c:252: error: conflicting types for 'mdiobus_read'
include/linux/phy.h:130: error: previous declaration of 'mdiobus_read' was here
drivers/net/au1000_eth.c:263: error: conflicting types for 'mdiobus_write'
include/linux/phy.h:131: error: previous declaration of 'mdiobus_write' was here
...
make[3]: *** [drivers/net/au1000_eth.o] Error 1

<--  snip  -->

This patch prefixes the driver functions with au1000_ 
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51cf756c
...@@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *); ...@@ -94,8 +94,8 @@ static irqreturn_t au1000_interrupt(int, void *);
static void au1000_tx_timeout(struct net_device *); static void au1000_tx_timeout(struct net_device *);
static void set_rx_mode(struct net_device *); static void set_rx_mode(struct net_device *);
static int au1000_ioctl(struct net_device *, struct ifreq *, int); static int au1000_ioctl(struct net_device *, struct ifreq *, int);
static int mdio_read(struct net_device *, int, int); static int au1000_mdio_read(struct net_device *, int, int);
static void mdio_write(struct net_device *, int, int, u16); static void au1000_mdio_write(struct net_device *, int, int, u16);
static void au1000_adjust_link(struct net_device *); static void au1000_adjust_link(struct net_device *);
static void enable_mac(struct net_device *, int); static void enable_mac(struct net_device *, int);
...@@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES]; ...@@ -191,7 +191,7 @@ struct au1000_private *au_macs[NUM_ETH_INTERFACES];
/* /*
* MII operations * MII operations
*/ */
static int mdio_read(struct net_device *dev, int phy_addr, int reg) static int au1000_mdio_read(struct net_device *dev, int phy_addr, int reg)
{ {
struct au1000_private *aup = (struct au1000_private *) dev->priv; struct au1000_private *aup = (struct au1000_private *) dev->priv;
volatile u32 *const mii_control_reg = &aup->mac->mii_control; volatile u32 *const mii_control_reg = &aup->mac->mii_control;
...@@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg) ...@@ -225,7 +225,8 @@ static int mdio_read(struct net_device *dev, int phy_addr, int reg)
return (int)*mii_data_reg; return (int)*mii_data_reg;
} }
static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value) static void au1000_mdio_write(struct net_device *dev, int phy_addr,
int reg, u16 value)
{ {
struct au1000_private *aup = (struct au1000_private *) dev->priv; struct au1000_private *aup = (struct au1000_private *) dev->priv;
volatile u32 *const mii_control_reg = &aup->mac->mii_control; volatile u32 *const mii_control_reg = &aup->mac->mii_control;
...@@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value) ...@@ -249,7 +250,7 @@ static void mdio_write(struct net_device *dev, int phy_addr, int reg, u16 value)
*mii_control_reg = mii_control; *mii_control_reg = mii_control;
} }
static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) static int au1000_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
{ {
/* WARNING: bus->phy_map[phy_addr].attached_dev == dev does /* WARNING: bus->phy_map[phy_addr].attached_dev == dev does
* _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */ * _NOT_ hold (e.g. when PHY is accessed through other MAC's MII bus) */
...@@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum) ...@@ -257,21 +258,21 @@ static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
enable_mac(dev, 0); /* make sure the MAC associated with this enable_mac(dev, 0); /* make sure the MAC associated with this
* mii_bus is enabled */ * mii_bus is enabled */
return mdio_read(dev, phy_addr, regnum); return au1000_mdio_read(dev, phy_addr, regnum);
} }
static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, static int au1000_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
u16 value) u16 value)
{ {
struct net_device *const dev = bus->priv; struct net_device *const dev = bus->priv;
enable_mac(dev, 0); /* make sure the MAC associated with this enable_mac(dev, 0); /* make sure the MAC associated with this
* mii_bus is enabled */ * mii_bus is enabled */
mdio_write(dev, phy_addr, regnum, value); au1000_mdio_write(dev, phy_addr, regnum, value);
return 0; return 0;
} }
static int mdiobus_reset(struct mii_bus *bus) static int au1000_mdiobus_reset(struct mii_bus *bus)
{ {
struct net_device *const dev = bus->priv; struct net_device *const dev = bus->priv;
...@@ -703,9 +704,9 @@ static struct net_device * au1000_probe(int port_num) ...@@ -703,9 +704,9 @@ static struct net_device * au1000_probe(int port_num)
goto err_out; goto err_out;
aup->mii_bus->priv = dev; aup->mii_bus->priv = dev;
aup->mii_bus->read = mdiobus_read; aup->mii_bus->read = au1000_mdiobus_read;
aup->mii_bus->write = mdiobus_write; aup->mii_bus->write = au1000_mdiobus_write;
aup->mii_bus->reset = mdiobus_reset; aup->mii_bus->reset = au1000_mdiobus_reset;
aup->mii_bus->name = "au1000_eth_mii"; aup->mii_bus->name = "au1000_eth_mii";
snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id); snprintf(aup->mii_bus->id, MII_BUS_ID_SIZE, "%x", aup->mac_id);
aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); aup->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment