Commit 4da8a876 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed function declaration typedefs from aiutils.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 45c05cbd
...@@ -1279,9 +1279,9 @@ ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn, ...@@ -1279,9 +1279,9 @@ ai_register_intr_callback(struct si_pub *sih, void *intrsoff_fn,
sii = SI_INFO(sih); sii = SI_INFO(sih);
sii->intr_arg = intr_arg; sii->intr_arg = intr_arg;
sii->intrsoff_fn = (si_intrsoff_t) intrsoff_fn; sii->intrsoff_fn = (u32 (*)(void *)) intrsoff_fn;
sii->intrsrestore_fn = (si_intrsrestore_t) intrsrestore_fn; sii->intrsrestore_fn = (void (*) (void *, u32)) intrsrestore_fn;
sii->intrsenabled_fn = (si_intrsenabled_t) intrsenabled_fn; sii->intrsenabled_fn = (bool (*)(void *)) intrsenabled_fn;
/* save current core id. when this function called, the current core /* save current core id. when this function called, the current core
* must be the core which provides driver functions(il, et, wl, etc.) * must be the core which provides driver functions(il, et, wl, etc.)
*/ */
......
...@@ -425,8 +425,6 @@ struct si_pub { ...@@ -425,8 +425,6 @@ struct si_pub {
#define CCPLL_ENAB(sih) ((sih)->cccaps & CC_CAP_PLL_MASK) #define CCPLL_ENAB(sih) ((sih)->cccaps & CC_CAP_PLL_MASK)
#endif #endif
typedef void (*gpio_handler_t) (u32 stat, void *arg);
/* External PA enable mask */ /* External PA enable mask */
#define GPIO_CTRL_EPA_EN_MASK 0x40 #define GPIO_CTRL_EPA_EN_MASK 0x40
...@@ -444,14 +442,10 @@ typedef void (*gpio_handler_t) (u32 stat, void *arg); ...@@ -444,14 +442,10 @@ typedef void (*gpio_handler_t) (u32 stat, void *arg);
#define IS_SIM(chippkg) \ #define IS_SIM(chippkg) \
((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID)) ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
typedef u32(*si_intrsoff_t) (void *intr_arg);
typedef void (*si_intrsrestore_t) (void *intr_arg, u32 arg);
typedef bool(*si_intrsenabled_t) (void *intr_arg);
struct gpioh_item { struct gpioh_item {
void *arg; void *arg;
bool level; bool level;
gpio_handler_t handler; void (*handler) (u32 stat, void *arg);
u32 event; u32 event;
struct gpioh_item *next; struct gpioh_item *next;
}; };
...@@ -462,9 +456,11 @@ struct si_info { ...@@ -462,9 +456,11 @@ struct si_info {
void *pbus; /* handle to bus (pci/sdio/..) */ void *pbus; /* handle to bus (pci/sdio/..) */
uint dev_coreid; /* the core provides driver functions */ uint dev_coreid; /* the core provides driver functions */
void *intr_arg; /* interrupt callback function arg */ void *intr_arg; /* interrupt callback function arg */
si_intrsoff_t intrsoff_fn; /* turns chip interrupts off */ u32 (*intrsoff_fn) (void *intr_arg); /* turns chip interrupts off */
si_intrsrestore_t intrsrestore_fn; /* restore chip interrupts */ /* restore chip interrupts */
si_intrsenabled_t intrsenabled_fn; /* check if interrupts are enabled */ void (*intrsrestore_fn) (void *intr_arg, u32 arg);
/* check if interrupts are enabled */
bool (*intrsenabled_fn) (void *intr_arg);
void *pch; /* PCI/E core handle */ void *pch; /* PCI/E core handle */
......
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