Skip to content

L
linux
Commit c6e69bb9 authored by Florian Fainelli's avatar Florian Fainelli Committed by Jeff Garzik
Browse files
Options

r6040: prefix all functions with r6040 

Prefix all functions inside the r6040 driver with r6040 to
avoid namespace clashing.
Signed-off-by: default avatarFlorian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 7e99eedd
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
drivers/net/r6040.c
View file @ c6e69bb9
...@@ -183,7 +183,7 @@ static char version[] __devinitdata = KERN_INFO DRV_NAME ...@@ -183,7 +183,7 @@ static char version[] __devinitdata = KERN_INFO DRV_NAME
static int phy_table[] = { PHY1_ADDR, PHY2_ADDR }; static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };
/* Read a word data from PHY Chip */ /* Read a word data from PHY Chip */
static int phy_read(void __iomem *ioaddr, int phy_addr, int reg) static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
{ {
int limit = 2048; int limit = 2048;
u16 cmd; u16 cmd;
...@@ -200,7 +200,7 @@ static int phy_read(void __iomem *ioaddr, int phy_addr, int reg) ...@@ -200,7 +200,7 @@ static int phy_read(void __iomem *ioaddr, int phy_addr, int reg)
} }
/* Write a word data from PHY Chip */ /* Write a word data from PHY Chip */
static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val)
{ {
int limit = 2048; int limit = 2048;
u16 cmd; u16 cmd;
...@@ -216,20 +216,20 @@ static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val) ...@@ -216,20 +216,20 @@ static void phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val)
} }
} }
static int mdio_read(struct net_device *dev, int mii_id, int reg) static int r6040_mdio_read(struct net_device *dev, int mii_id, int reg)
{ {
struct r6040_private *lp = netdev_priv(dev); struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base; void __iomem *ioaddr = lp->base;
return (phy_read(ioaddr, lp->phy_addr, reg)); return (r6040_phy_read(ioaddr, lp->phy_addr, reg));
} }
static void mdio_write(struct net_device *dev, int mii_id, int reg, int val) static void r6040_mdio_write(struct net_device *dev, int mii_id, int reg, int val)
{ {
struct r6040_private *lp = netdev_priv(dev); struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base; void __iomem *ioaddr = lp->base;
phy_write(ioaddr, lp->phy_addr, reg, val); r6040_phy_write(ioaddr, lp->phy_addr, reg, val);
} }
static void r6040_free_txbufs(struct net_device *dev) static void r6040_free_txbufs(struct net_device *dev)
...@@ -284,7 +284,7 @@ static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, ...@@ -284,7 +284,7 @@ static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring,
} }
/* Allocate skb buffer for rx descriptor */ /* Allocate skb buffer for rx descriptor */
static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) static void r6040_rx_buf_alloc(struct r6040_private *lp, struct net_device *dev)
{ {
struct r6040_descriptor *descptr; struct r6040_descriptor *descptr;
void __iomem *ioaddr = lp->base; void __iomem *ioaddr = lp->base;
...@@ -331,7 +331,7 @@ static void r6040_alloc_rxbufs(struct net_device *dev) ...@@ -331,7 +331,7 @@ static void r6040_alloc_rxbufs(struct net_device *dev)
lp->rx_remove_ptr = lp->rx_insert_ptr = lp->rx_ring; lp->rx_remove_ptr = lp->rx_insert_ptr = lp->rx_ring;
r6040_init_ring_desc(lp->rx_ring, lp->rx_ring_dma, RX_DCNT); r6040_init_ring_desc(lp->rx_ring, lp->rx_ring_dma, RX_DCNT);
rx_buf_alloc(lp, dev); r6040_rx_buf_alloc(lp, dev);
iowrite16(lp->rx_ring_dma, ioaddr + MRD_SA0); iowrite16(lp->rx_ring_dma, ioaddr + MRD_SA0);
iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1); iowrite16(lp->rx_ring_dma >> 16, ioaddr + MRD_SA1);
...@@ -345,7 +345,7 @@ static void r6040_tx_timeout(struct net_device *dev) ...@@ -345,7 +345,7 @@ static void r6040_tx_timeout(struct net_device *dev)
printk(KERN_WARNING "%s: transmit timed out, status %4.4x, PHY status " printk(KERN_WARNING "%s: transmit timed out, status %4.4x, PHY status "
"%4.4x\n", "%4.4x\n",
dev->name, ioread16(ioaddr + MIER), dev->name, ioread16(ioaddr + MIER),
mdio_read(dev, priv->mii_if.phy_id, MII_BMSR)); r6040_mdio_read(dev, priv->mii_if.phy_id, MII_BMSR));
disable_irq(dev->irq); disable_irq(dev->irq);
napi_disable(&priv->napi); napi_disable(&priv->napi);
...@@ -432,23 +432,23 @@ static int r6040_close(struct net_device *dev) ...@@ -432,23 +432,23 @@ static int r6040_close(struct net_device *dev)
} }
/* Status of PHY CHIP */ /* Status of PHY CHIP */
static int phy_mode_chk(struct net_device *dev) static int r6040_phy_mode_chk(struct net_device *dev)
{ {
struct r6040_private *lp = netdev_priv(dev); struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base; void __iomem *ioaddr = lp->base;
int phy_dat; int phy_dat;
/* PHY Link Status Check */ /* PHY Link Status Check */
phy_dat = phy_read(ioaddr, lp->phy_addr, 1); phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
if (!(phy_dat & 0x4)) if (!(phy_dat & 0x4))
phy_dat = 0x8000; /* Link Failed, full duplex */ phy_dat = 0x8000; /* Link Failed, full duplex */
/* PHY Chip Auto-Negotiation Status */ /* PHY Chip Auto-Negotiation Status */
phy_dat = phy_read(ioaddr, lp->phy_addr, 1); phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 1);
if (phy_dat & 0x0020) { if (phy_dat & 0x0020) {
/* Auto Negotiation Mode */ /* Auto Negotiation Mode */
phy_dat = phy_read(ioaddr, lp->phy_addr, 5); phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 5);
phy_dat &= phy_read(ioaddr, lp->phy_addr, 4); phy_dat &= r6040_phy_read(ioaddr, lp->phy_addr, 4);
if (phy_dat & 0x140) if (phy_dat & 0x140)
/* Force full duplex */ /* Force full duplex */
phy_dat = 0x8000; phy_dat = 0x8000;
...@@ -456,7 +456,7 @@ static int phy_mode_chk(struct net_device *dev) ...@@ -456,7 +456,7 @@ static int phy_mode_chk(struct net_device *dev)
phy_dat = 0; phy_dat = 0;
} else { } else {
/* Force Mode */ /* Force Mode */
phy_dat = phy_read(ioaddr, lp->phy_addr, 0); phy_dat = r6040_phy_read(ioaddr, lp->phy_addr, 0);
if (phy_dat & 0x100) if (phy_dat & 0x100)
phy_dat = 0x8000; phy_dat = 0x8000;
else else
...@@ -468,12 +468,12 @@ static int phy_mode_chk(struct net_device *dev) ...@@ -468,12 +468,12 @@ static int phy_mode_chk(struct net_device *dev)
static void r6040_set_carrier(struct mii_if_info *mii) static void r6040_set_carrier(struct mii_if_info *mii)
{ {
if (phy_mode_chk(mii->dev)) { if (r6040_phy_mode_chk(mii->dev)) {
/* autoneg is off: Link is always assumed to be up */ /* autoneg is off: Link is always assumed to be up */
if (!netif_carrier_ok(mii->dev)) if (!netif_carrier_ok(mii->dev))
netif_carrier_on(mii->dev); netif_carrier_on(mii->dev);
} else } else
phy_mode_chk(mii->dev); r6040_phy_mode_chk(mii->dev);
} }
static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
...@@ -560,7 +560,7 @@ static int r6040_rx(struct net_device *dev, int limit) ...@@ -560,7 +560,7 @@ static int r6040_rx(struct net_device *dev, int limit)
} }
/* Allocate new RX buffer */ /* Allocate new RX buffer */
if (priv->rx_free_desc < RX_DCNT) if (priv->rx_free_desc < RX_DCNT)
rx_buf_alloc(priv, priv->dev); r6040_rx_buf_alloc(priv, priv->dev);
return count; return count;
} }
...@@ -672,18 +672,18 @@ static void r6040_up(struct net_device *dev) ...@@ -672,18 +672,18 @@ static void r6040_up(struct net_device *dev)
/* Buffer Size Register */ /* Buffer Size Register */
iowrite16(MAX_BUF_SIZE, ioaddr + MR_BSR); iowrite16(MAX_BUF_SIZE, ioaddr + MR_BSR);
/* Read the PHY ID */ /* Read the PHY ID */
lp->switch_sig = phy_read(ioaddr, 0, 2); lp->switch_sig = r6040_phy_read(ioaddr, 0, 2);
if (lp->switch_sig == ICPLUS_PHY_ID) { if (lp->switch_sig == ICPLUS_PHY_ID) {
phy_write(ioaddr, 29, 31, 0x175C); /* Enable registers */ r6040_phy_write(ioaddr, 29, 31, 0x175C); /* Enable registers */
lp->phy_mode = 0x8000; lp->phy_mode = 0x8000;
} else { } else {
/* PHY Mode Check */ /* PHY Mode Check */
phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP); r6040_phy_write(ioaddr, lp->phy_addr, 4, PHY_CAP);
phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE); r6040_phy_write(ioaddr, lp->phy_addr, 0, PHY_MODE);
if (PHY_MODE == 0x3100) if (PHY_MODE == 0x3100)
lp->phy_mode = phy_mode_chk(dev); lp->phy_mode = r6040_phy_mode_chk(dev);
else else
lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0; lp->phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
} }
...@@ -699,10 +699,10 @@ static void r6040_up(struct net_device *dev) ...@@ -699,10 +699,10 @@ static void r6040_up(struct net_device *dev)
iowrite16(0x0F06, ioaddr + MR_ICR); iowrite16(0x0F06, ioaddr + MR_ICR);
/* improve performance (by RDC guys) */ /* improve performance (by RDC guys) */
phy_write(ioaddr, 30, 17, (phy_read(ioaddr, 30, 17) | 0x4000)); r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
phy_write(ioaddr, 30, 17, ~((~phy_read(ioaddr, 30, 17)) | 0x2000)); r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
phy_write(ioaddr, 0, 19, 0x0000); r6040_phy_write(ioaddr, 0, 19, 0x0000);
phy_write(ioaddr, 0, 30, 0x01F0); r6040_phy_write(ioaddr, 0, 30, 0x01F0);
/* Interrupt Mask Register */ /* Interrupt Mask Register */
iowrite16(INT_MASK, ioaddr + MIER); iowrite16(INT_MASK, ioaddr + MIER);
...@@ -721,7 +721,7 @@ static void r6040_timer(unsigned long data) ...@@ -721,7 +721,7 @@ static void r6040_timer(unsigned long data)
/* Polling PHY Chip Status */ /* Polling PHY Chip Status */
if (PHY_MODE == 0x3100) if (PHY_MODE == 0x3100)
phy_mode = phy_mode_chk(dev); phy_mode = r6040_phy_mode_chk(dev);
else else
phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0; phy_mode = (PHY_MODE & 0x0100) ? 0x8000:0x0;
...@@ -1070,8 +1070,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, ...@@ -1070,8 +1070,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
#endif #endif
netif_napi_add(dev, &lp->napi, r6040_poll, 64); netif_napi_add(dev, &lp->napi, r6040_poll, 64);
lp->mii_if.dev = dev; lp->mii_if.dev = dev;
lp->mii_if.mdio_read = mdio_read; lp->mii_if.mdio_read = r6040_mdio_read;
lp->mii_if.mdio_write = mdio_write; lp->mii_if.mdio_write = r6040_mdio_write;
lp->mii_if.phy_id = lp->phy_addr; lp->mii_if.phy_id = lp->phy_addr;
lp->mii_if.phy_id_mask = 0x1f; lp->mii_if.phy_id_mask = 0x1f;
lp->mii_if.reg_num_mask = 0x1f; lp->mii_if.reg_num_mask = 0x1f;
......
Markdown is supported
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7