target/linux/brcm47xx/patches-3.10/204-b44-rename-b44_mii_-read-write-to-b44_mdio_-read-wri.patch

   1 From 348baa6c81cf774811040e4da01438d077a08301 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Fri, 20 Dec 2013 02:16:09 +0100
   4 Subject: [PATCH 204/208] b44: rename b44_mii_{read, write} to b44_mdio_{read,
   5  write}_mii
   6
   7 The next patch will add these functions for phylib, and we should
   8 rename the old ones before. This now indicates that these functions are
   9 used for the mdio registers and on the mii interface.
  10
  11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  12 Signed-off-by: David S. Miller <davem@davemloft.net>
  13 ---
  14  drivers/net/ethernet/broadcom/b44.c |   10 +++++-----
  15  1 file changed, 5 insertions(+), 5 deletions(-)
  16
  17 --- a/drivers/net/ethernet/broadcom/b44.c
  18 +++ b/drivers/net/ethernet/broadcom/b44.c
  19 @@ -299,7 +299,7 @@ static inline int b44_writephy(struct b4
  20  }
  21
  22  /* miilib interface */
  23 -static int b44_mii_read(struct net_device *dev, int phy_id, int location)
  24 +static int b44_mdio_read_mii(struct net_device *dev, int phy_id, int location)
  25  {
  26         u32 val;
  27         struct b44 *bp = netdev_priv(dev);
  28 @@ -309,8 +309,8 @@ static int b44_mii_read(struct net_devic
  29         return val;
  30  }
  31
  32 -static void b44_mii_write(struct net_device *dev, int phy_id, int location,
  33 -                        int val)
  34 +static void b44_mdio_write_mii(struct net_device *dev, int phy_id, int location,
  35 +                              int val)
  36  {
  37         struct b44 *bp = netdev_priv(dev);
  38         __b44_writephy(bp, phy_id, location, val);
  39 @@ -2214,8 +2214,8 @@ static int b44_init_one(struct ssb_devic
  40         }
  41
  42         bp->mii_if.dev = dev;
  43 -       bp->mii_if.mdio_read = b44_mii_read;
  44 -       bp->mii_if.mdio_write = b44_mii_write;
  45 +       bp->mii_if.mdio_read = b44_mdio_read_mii;
  46 +       bp->mii_if.mdio_write = b44_mdio_write_mii;
  47         bp->mii_if.phy_id = bp->phy_addr;
  48         bp->mii_if.phy_id_mask = 0x1f;
  49         bp->mii_if.reg_num_mask = 0x1f;