hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <hkallweit1@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43467 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-12-01 16:14:39 +00:00
parent 5a3c2d9aa7
commit 8a609f9af7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -86,6 +86,7 @@ struct ar8xxx_chip {
const struct ar8xxx_mib_desc *mib_decs; const struct ar8xxx_mib_desc *mib_decs;
unsigned num_mibs; unsigned num_mibs;
unsigned mib_func;
}; };
enum ar8327_led_pattern { enum ar8327_led_pattern {
@ -532,16 +533,11 @@ ar8xxx_reg_wait(struct ar8xxx_priv *priv, u32 reg, u32 mask, u32 val,
static int static int
ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op) ar8xxx_mib_op(struct ar8xxx_priv *priv, u32 op)
{ {
unsigned mib_func; unsigned mib_func = priv->chip->mib_func;
int ret; int ret;
lockdep_assert_held(&priv->mib_lock); 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 */ /* Capture the hardware statistics for all ports */
ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S)); ar8xxx_rmw(priv, mib_func, AR8216_MIB_FUNC, (op << AR8216_MIB_FUNC_S));
@ -898,6 +894,7 @@ static const struct ar8xxx_chip ar8216_chip = {
.num_mibs = ARRAY_SIZE(ar8216_mibs), .num_mibs = ARRAY_SIZE(ar8216_mibs),
.mib_decs = ar8216_mibs, .mib_decs = ar8216_mibs,
.mib_func = AR8216_REG_MIB_FUNC
}; };
static void static void
@ -964,6 +961,7 @@ static const struct ar8xxx_chip ar8236_chip = {
.num_mibs = ARRAY_SIZE(ar8236_mibs), .num_mibs = ARRAY_SIZE(ar8236_mibs),
.mib_decs = ar8236_mibs, .mib_decs = ar8236_mibs,
.mib_func = AR8216_REG_MIB_FUNC
}; };
static int static int
@ -1047,6 +1045,7 @@ static const struct ar8xxx_chip ar8316_chip = {
.num_mibs = ARRAY_SIZE(ar8236_mibs), .num_mibs = ARRAY_SIZE(ar8236_mibs),
.mib_decs = ar8236_mibs, .mib_decs = ar8236_mibs,
.mib_func = AR8216_REG_MIB_FUNC
}; };
static u32 static u32
@ -1836,6 +1835,7 @@ static const struct ar8xxx_chip ar8327_chip = {
.num_mibs = ARRAY_SIZE(ar8236_mibs), .num_mibs = ARRAY_SIZE(ar8236_mibs),
.mib_decs = ar8236_mibs, .mib_decs = ar8236_mibs,
.mib_func = AR8327_REG_MIB_FUNC
}; };
static int static int