Commit 45c05cbd authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed function declaration typedefs from phy_int.h

Softmac related code cleanup. Typedefs are undesirable according to the
CodingStyle document.
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 839f9f62
...@@ -865,7 +865,7 @@ void wlc_phy_hw_state_upd(struct brcms_phy_pub *pih, bool newstate) ...@@ -865,7 +865,7 @@ void wlc_phy_hw_state_upd(struct brcms_phy_pub *pih, bool newstate)
void wlc_phy_init(struct brcms_phy_pub *pih, chanspec_t chanspec) void wlc_phy_init(struct brcms_phy_pub *pih, chanspec_t chanspec)
{ {
u32 mc; u32 mc;
initfn_t phy_init = NULL; void (*phy_init) (struct brcms_phy *) = NULL;
struct brcms_phy *pi = (struct brcms_phy *) pih; struct brcms_phy *pi = (struct brcms_phy *) pih;
if (pi->init_in_progress) if (pi->init_in_progress)
...@@ -921,7 +921,7 @@ void wlc_phy_init(struct brcms_phy_pub *pih, chanspec_t chanspec) ...@@ -921,7 +921,7 @@ void wlc_phy_init(struct brcms_phy_pub *pih, chanspec_t chanspec)
void wlc_phy_cal_init(struct brcms_phy_pub *pih) void wlc_phy_cal_init(struct brcms_phy_pub *pih)
{ {
struct brcms_phy *pi = (struct brcms_phy *) pih; struct brcms_phy *pi = (struct brcms_phy *) pih;
initfn_t cal_init = NULL; void (*cal_init)(struct brcms_phy *) = NULL;
if (WARN((R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC) != 0, if (WARN((R_REG(&pi->regs->maccontrol) & MCTL_EN_MAC) != 0,
"HW error: MAC enabled during phy cal\n")) "HW error: MAC enabled during phy cal\n"))
...@@ -1329,8 +1329,7 @@ void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, chanspec_t chanspec) ...@@ -1329,8 +1329,7 @@ void wlc_phy_chanspec_set(struct brcms_phy_pub *ppi, chanspec_t chanspec)
{ {
struct brcms_phy *pi = (struct brcms_phy *) ppi; struct brcms_phy *pi = (struct brcms_phy *) ppi;
u16 m_cur_channel; u16 m_cur_channel;
chansetfn_t chanspec_set = NULL; void (*chanspec_set) (struct brcms_phy *, chanspec_t) = NULL;
m_cur_channel = CHSPEC_CHANNEL(chanspec); m_cur_channel = CHSPEC_CHANNEL(chanspec);
if (CHSPEC_IS5G(chanspec)) if (CHSPEC_IS5G(chanspec))
m_cur_channel |= D11_CURCHANNEL_5G; m_cur_channel |= D11_CURCHANNEL_5G;
...@@ -1671,7 +1670,7 @@ void wlc_phy_txpower_recalc_target(struct brcms_phy *pi) ...@@ -1671,7 +1670,7 @@ void wlc_phy_txpower_recalc_target(struct brcms_phy *pi)
u8 start_rate = 0; u8 start_rate = 0;
chanspec_t chspec; chanspec_t chspec;
u32 band = CHSPEC2BAND(pi->radio_chanspec); u32 band = CHSPEC2BAND(pi->radio_chanspec);
initfn_t txpwr_recalc_fn = NULL; void (*txpwr_recalc_fn)(struct brcms_phy *) = NULL;
chspec = pi->radio_chanspec; chspec = pi->radio_chanspec;
if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_NONE) if (CHSPEC_CTL_SB(chspec) == WL_CHANSPEC_CTL_SB_NONE)
......
...@@ -49,17 +49,6 @@ struct brcms_phy_srom_fem { ...@@ -49,17 +49,6 @@ struct brcms_phy_srom_fem {
u8 antswctrllut; /* antswctrl lookup table configuration: 32 possible choices */ u8 antswctrllut; /* antswctrl lookup table configuration: 32 possible choices */
}; };
typedef void (*initfn_t) (struct brcms_phy *);
typedef void (*chansetfn_t) (struct brcms_phy *, chanspec_t);
typedef int (*longtrnfn_t) (struct brcms_phy *, int);
typedef void (*txiqccgetfn_t) (struct brcms_phy *, u16 *, u16 *);
typedef void (*txiqccsetfn_t) (struct brcms_phy *, u16, u16);
typedef u16(*txloccgetfn_t) (struct brcms_phy *);
typedef void (*radioloftgetfn_t) (struct brcms_phy *, u8 *, u8 *, u8 *,
u8 *);
typedef s32(*rxsigpwrfn_t) (struct brcms_phy *, s32);
typedef void (*detachfn_t) (struct brcms_phy *);
#undef ISNPHY #undef ISNPHY
#undef ISLCNPHY #undef ISLCNPHY
#define ISNPHY(pi) PHYTYPE_IS((pi)->pubpi.phy_type, PHY_TYPE_N) #define ISNPHY(pi) PHYTYPE_IS((pi)->pubpi.phy_type, PHY_TYPE_N)
...@@ -579,18 +568,18 @@ struct brcms_phy_pub { ...@@ -579,18 +568,18 @@ struct brcms_phy_pub {
}; };
struct phy_func_ptr { struct phy_func_ptr {
initfn_t init; void (*init) (struct brcms_phy *);
initfn_t calinit; void (*calinit) (struct brcms_phy *);
chansetfn_t chanset; void (*chanset) (struct brcms_phy *, chanspec_t);
initfn_t txpwrrecalc; void (*txpwrrecalc) (struct brcms_phy *);
longtrnfn_t longtrn; int (*longtrn) (struct brcms_phy *, int);
txiqccgetfn_t txiqccget; void (*txiqccget) (struct brcms_phy *, u16 *, u16 *);
txiqccsetfn_t txiqccset; void (*txiqccset) (struct brcms_phy *, u16, u16);
txloccgetfn_t txloccget; u16(*txloccget) (struct brcms_phy *);
radioloftgetfn_t radioloftget; void (*radioloftget) (struct brcms_phy *, u8 *, u8 *, u8 *, u8 *);
initfn_t carrsuppr; void (*carrsuppr) (struct brcms_phy *);
rxsigpwrfn_t rxsigpwr; s32(*rxsigpwr) (struct brcms_phy *, s32);
detachfn_t detach; void (*detach) (struct brcms_phy *);
}; };
struct brcms_phy { struct brcms_phy {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment