ar71xx: use pr_* functions in drivers

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_ar7240.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
index a8e68404b93de912162b906d790670540ca05adc..408fa664a9ea3cea5cd2a1a8c03e652843726e29 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar7240.c
@@ -219,17 +219,17 @@ static inline void ar7240sw_init(struct ar7240sw *as, struct mii_bus *mii)
 
 static inline u16 mk_phy_addr(u32 reg)
 {
-       return (0x17 & ((reg >> 4) | 0x10));
+       return 0x17 & ((reg >> 4) | 0x10);
 }
 
 static inline u16 mk_phy_reg(u32 reg)
 {
-       return ((reg << 1) & 0x1e);
+       return (reg << 1) & 0x1e;
 }
 
 static inline u16 mk_high_addr(u32 reg)
 {
-       return ((reg >> 7) & 0x1ff);
+       return (reg >> 7) & 0x1ff;
 }
 
 static u32 __ar7240sw_reg_read(struct ar7240sw *as, u32 reg)
@@ -249,7 +249,7 @@ static u32 __ar7240sw_reg_read(struct ar7240sw *as, u32 reg)
        lo = (u32) mdiobus_read(mii, phy_addr, phy_reg);
        hi = (u32) mdiobus_read(mii, phy_addr, phy_reg + 1);
 
-       return ((hi << 16) | lo);
+       return (hi << 16) | lo;
 }
 
 static void __ar7240sw_reg_write(struct ar7240sw *as, u32 reg, u32 val)
@@ -352,7 +352,7 @@ static u16 ar7240sw_phy_read(struct ar7240sw *as, unsigned phy_addr,
                return 0xffff;
 
        t = ar7240sw_reg_read(as, AR7240_REG_MDIO_CTRL);
-       return (t & AR7240_MDIO_CTRL_DATA_M);
+       return t & AR7240_MDIO_CTRL_DATA_M;
 }
 
 static int ar7240sw_phy_write(struct ar7240sw *as, unsigned phy_addr,
@@ -770,7 +770,8 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
 
        ver = (ctrl >> AR7240_MASK_CTRL_VERSION_S) & AR7240_MASK_CTRL_VERSION_M;
        if (ver != 1) {
-               pr_err("%s: unsupported chip, ctrl=%08x\n", ag->dev->name, ctrl);
+               pr_err("%s: unsupported chip, ctrl=%08x\n",
+                       ag->dev->name, ctrl);
                return NULL;
        }
 
@@ -794,7 +795,7 @@ static struct ar7240sw *ar7240_probe(struct ag71xx *ag)
                return NULL;
        }
 
-       printk("%s: Found an AR7240 built-in switch\n", ag->dev->name);
+       pr_info("%s: Found an AR7240 built-in switch\n", ag->dev->name);
 
        /* initialize defaults */
        for (i = 0; i < AR7240_MAX_VLANS; i++)