Author: blogic Date: 2014-12-01 17:14:39 +0100 (Mon, 01 Dec 2014) New Revision: 43467
Modified: trunk/target/linux/generic/files/drivers/net/phy/ar8216.c Log: ar8216: factor out mib_func to ar8xxx_chip Factor out mib_func to ar8xxx_chip. Remove related chip_is_... checks. Signed-off-by: Heiner Kallweit <[email protected]> Modified: trunk/target/linux/generic/files/drivers/net/phy/ar8216.c =================================================================== --- trunk/target/linux/generic/files/drivers/net/phy/ar8216.c 2014-12-01 16:14:32 UTC (rev 43466) +++ trunk/target/linux/generic/files/drivers/net/phy/ar8216.c 2014-12-01 16:14:39 UTC (rev 43467) @@ -86,6 +86,7 @@ const struct ar8xxx_mib_desc *mib_decs; unsigned num_mibs; + unsigned mib_func; }; enum ar8327_led_pattern { @@ -532,16 +533,11 @@ static int ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op) { - unsigned mib_func; + unsigned mib_func = priv->chip->mib_func; int ret; lockdep_assert_held(&priv->mib_lock); - if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) - mib_func = AR8327_REG_MIB_FUNC; - else - mib_func = AR8216_REG_MIB_FUNC; - /* Capture the hardware statistics for all ports */ ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S)); @@ -898,6 +894,7 @@ .num_mibs = ARRAY_SIZE(ar8216_mibs), .mib_decs = ar8216_mibs, + .mib_func = AR8216_REG_MIB_FUNC }; static void @@ -964,6 +961,7 @@ .num_mibs = ARRAY_SIZE(ar8236_mibs), .mib_decs = ar8236_mibs, + .mib_func = AR8216_REG_MIB_FUNC }; static int @@ -1047,6 +1045,7 @@ .num_mibs = ARRAY_SIZE(ar8236_mibs), .mib_decs = ar8236_mibs, + .mib_func = AR8216_REG_MIB_FUNC }; static u32 @@ -1836,6 +1835,7 @@ .num_mibs = ARRAY_SIZE(ar8236_mibs), .mib_decs = ar8236_mibs, + .mib_func = AR8327_REG_MIB_FUNC }; static int _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
