diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-22 10:33:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-22 10:33:03 +0000 |
| commit | 3205b52d1c88d40936d9f300e1b67ca174f4f248 (patch) | |
| tree | de8cc2302670e18c17cab1a6df93b71853a6a2c7 /target/linux | |
| parent | bca3953ee5f178303ed835f66784a4cb21f7c8cd (diff) | |
| download | upstream-3205b52d1c88d40936d9f300e1b67ca174f4f248.tar.gz upstream-3205b52d1c88d40936d9f300e1b67ca174f4f248.tar.bz2 upstream-3205b52d1c88d40936d9f300e1b67ca174f4f248.zip | |
generic: ar8216: introduce ar8216_mib_op helper
The ar8216_mib_{capture,flush} functions are similar.
Move the common code into a helper and use that from
the original functions.
This change also fixes a lockdep warning in
ar8216_mib_flush.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34297
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 6187d523ab..8f3aded48f 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -361,7 +361,7 @@ ar8216_reg_wait(struct ar8216_priv *priv, u32 reg, u32 mask, u32 val, } static int -ar8216_mib_capture(struct ar8216_priv *priv) +ar8216_mib_op(struct ar8216_priv *priv, u32 op) { unsigned mib_func; int ret; @@ -375,8 +375,7 @@ ar8216_mib_capture(struct ar8216_priv *priv) mutex_lock(&priv->reg_mutex); /* Capture the hardware statistics for all ports */ - ar8216_rmw(priv, mib_func, AR8216_MIB_FUNC, - (AR8216_MIB_FUNC_CAPTURE << AR8216_MIB_FUNC_S)); + ar8216_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S)); mutex_unlock(&priv->reg_mutex); /* Wait for the capturing to complete. */ @@ -391,31 +390,15 @@ out: } static int -ar8216_mib_flush(struct ar8216_priv *priv) +ar8216_mib_capture(struct ar8216_priv *priv) { - unsigned mib_func; - int ret; - - lockdep_assert_held(&priv->mib_lock); - - if (chip_is_ar8327(priv)) - mib_func = AR8327_REG_MIB_FUNC; - else - mib_func = AR8216_REG_MIB_FUNC; - - /* Flush hardware statistics for all ports */ - ar8216_rmw(priv, mib_func, AR8216_MIB_FUNC, - (AR8216_MIB_FUNC_FLUSH << AR8216_MIB_FUNC_S)); - - /* Wait for the capturing to complete. */ - ret = ar8216_reg_wait(priv, mib_func, AR8216_MIB_BUSY, 0, 10); - if (ret) - goto out; - - ret = 0; + return ar8216_mib_op(priv, AR8216_MIB_FUNC_CAPTURE); +} -out: - return ret; +static int +ar8216_mib_flush(struct ar8216_priv *priv) +{ + return ar8216_mib_op(priv, AR8216_MIB_FUNC_FLUSH); } static void |