Skip to content

Commit

Permalink
staging: brcm80211: removed function declaration typedefs from otp.c
Browse files Browse the repository at this point in the history
Softmac related code cleanup. Typedefs are undesirable according to the
CodingStyle document.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roland Vossen authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent bc8adcd commit 87c0c56
Showing 1 changed file with 13 additions and 21 deletions.
34 changes: 13 additions & 21 deletions drivers/staging/brcm80211/brcmsmac/otp.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,15 @@

#define MAXNUMRDES 9 /* Maximum OTP redundancy entries */

/* OTP common function type */
typedef int (*otp_status_t) (void *oh);
typedef int (*otp_size_t) (void *oh);
typedef void *(*otp_init_t) (struct si_pub *sih);
typedef u16(*otp_read_bit_t) (void *oh, chipcregs_t *cc, uint off);
typedef int (*otp_read_region_t) (struct si_pub *sih, int region, u16 *data,
uint *wlen);
typedef int (*otp_nvread_t) (void *oh, char *data, uint *len);

/* OTP function struct */
struct otp_fn_s {
otp_size_t size;
otp_read_bit_t read_bit;
otp_init_t init;
otp_read_region_t read_region;
otp_nvread_t nvread;
otp_status_t status;
int (*size)(void *oh);
u16 (*read_bit)(void *oh, chipcregs_t *cc, uint off);
void *(*init)(struct si_pub *sih);
int (*read_region)(struct si_pub *sih, int region, u16 *data,
uint *wlen);
int (*nvread)(void *oh, char *data, uint *len);
int (*status)(void *oh);
};

struct otpinfo {
Expand Down Expand Up @@ -445,14 +437,14 @@ static int ipxotp_nvread(void *oh, char *data, uint *len)
}

static struct otp_fn_s ipxotp_fn = {
(otp_size_t) ipxotp_size,
(otp_read_bit_t) ipxotp_read_bit,
(int (*)(void *)) ipxotp_size,
(u16 (*)(void *, chipcregs_t *, uint)) ipxotp_read_bit,

(otp_init_t) ipxotp_init,
(otp_read_region_t) ipxotp_read_region,
(otp_nvread_t) ipxotp_nvread,
(void *(*)(struct si_pub *)) ipxotp_init,
(int (*)(struct si_pub *, int, u16 *, uint *)) ipxotp_read_region,
(int (*)(void *, char *, uint *)) ipxotp_nvread,

(otp_status_t) ipxotp_status
(int (*)(void *)) ipxotp_status
};

/*
Expand Down

0 comments on commit 87c0c56

Please sign in to comment.