Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

[oweals/u-boot.git] / drivers / net / phy / miiphybb.c

diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
index 4a7ce5b0454360e903374e3b2c18f8b2f482d370..49a1f5fb49fd8269852ad8a6c138652b4549bc75 100644 (file)
--- a/drivers/net/phy/miiphybb.c
+++ b/drivers/net/phy/miiphybb.c
@@ -119,7 +119,7 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
 };
 
 int bb_miiphy_buses_num = sizeof(bb_miiphy_buses) /
-                          sizeof(bb_miiphy_buses[0]);
+                         sizeof(bb_miiphy_buses[0]);
 #endif
 
 void bb_miiphy_init(void)
@@ -127,7 +127,7 @@ void bb_miiphy_init(void)
        int i;
 
        for (i = 0; i < bb_miiphy_buses_num; i++) {
-#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
                /* Relocate the hook pointers*/
                BB_MII_RELOCATE(bb_miiphy_buses[i].init, gd->reloc_off);
                BB_MII_RELOCATE(bb_miiphy_buses[i].mdio_active, gd->reloc_off);
@@ -143,7 +143,7 @@ void bb_miiphy_init(void)
        }
 }
 
-static inline struct bb_miiphy_bus *bb_miiphy_getbus(char *devname)
+static inline struct bb_miiphy_bus *bb_miiphy_getbus(const char *devname)
 {
 #ifdef CONFIG_BITBANGMII_MULTI
        int i;
@@ -167,7 +167,7 @@ static inline struct bb_miiphy_bus *bb_miiphy_getbus(char *devname)
  * and write).
  */
 static void miiphy_pre(struct bb_miiphy_bus *bus, char read,
-                       unsigned char addr, unsigned char reg)
+                      unsigned char addr, unsigned char reg)
 {
        int j;
 
@@ -246,8 +246,8 @@ static void miiphy_pre(struct bb_miiphy_bus *bus, char read,
  * Returns:
  *   0 on success
  */
-int bb_miiphy_read(char *devname, unsigned char addr,
-                   unsigned char reg, unsigned short *value)
+int bb_miiphy_read(const char *devname, unsigned char addr,
+                  unsigned char reg, unsigned short *value)
 {
        short rdreg; /* register working value */
        int v;
@@ -327,8 +327,8 @@ int bb_miiphy_read(char *devname, unsigned char addr,
  * Returns:
  *   0 on success
  */
-int bb_miiphy_write (char *devname, unsigned char addr,
-                     unsigned char reg, unsigned short value)
+int bb_miiphy_write (const char *devname, unsigned char addr,
+                    unsigned char reg, unsigned short value)
 {
        struct bb_miiphy_bus *bus;
        int j;                  /* counter */