Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63bec49e authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed last typedefs from fullmac 



Code cleanup.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 46c3db78

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+6 −6
Original line number Diff line number Diff line
@@ -92,14 +92,11 @@ struct brcmf_sdreg { 
	int value;

};



/* callback function, taking one arg */

typedef void (*sdioh_cb_fn_t) (void *);



struct sdioh_info {

	struct osl_info *osh;		/* osh handler */

	bool client_intr_enabled;	/* interrupt connnected flag */

	bool intr_handler_valid;	/* client driver interrupt handler valid */

	sdioh_cb_fn_t intr_handler;	/* registered interrupt handler */

	void (*intr_handler)(void *);	/* registered interrupt handler */

	void *intr_handler_arg;	/* argument to call interrupt handler */

	u16 intmask;		/* Current active interrupts */

	void *sdos_info;	/* Pointer to per-OS private data */
@@ -149,8 +146,11 @@ extern void brcmf_sdioh_free_irq(uint irq, struct sdioh_info *sd); 
 */

extern struct sdioh_info *brcmf_sdioh_attach(void *cfghdl, uint irq);

extern int brcmf_sdioh_detach(struct sdioh_info *si);

extern int brcmf_sdioh_interrupt_register(struct sdioh_info *si,

					     sdioh_cb_fn_t fn, void *argh);



extern int

brcmf_sdioh_interrupt_register(struct sdioh_info *si,

			       void (*sdioh_cb_fn)(void *), void *argh);



extern int brcmf_sdioh_interrupt_deregister(struct sdioh_info *si);



/* query whether SD interrupt is enabled or not */

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+8 −6
Original line number Diff line number Diff line
@@ -145,8 +145,7 @@ int brcmf_sdcard_intr_disable(struct brcmf_sdio_card *card) 
}



int brcmf_sdcard_intr_reg(struct brcmf_sdio_card *card,

			  brcmf_sdiocard_cb_fn_t fn,

			  void *argh)

			  void (*fn)(void *), void *argh)

{

	ASSERT(card);
@@ -161,8 +160,7 @@ int brcmf_sdcard_intr_dereg(struct brcmf_sdio_card *card) 
}



int brcmf_sdcard_devremove_reg(struct brcmf_sdio_card *card,

			       brcmf_sdiocard_cb_fn_t fn,

			       void *argh)

			       void (*fn)(void *), void *argh)

{

	ASSERT(card);
@@ -443,7 +441,9 @@ int 
brcmf_sdcard_recv_buf(struct brcmf_sdio_card *card, u32 addr, uint fn,

		      uint flags,

		      u8 *buf, uint nbytes, struct sk_buff *pkt,

		      brcmf_sdio_cmplt_fn_t complete, void *handle)

		      void (*complete)(void *handle, int status,

				       bool sync_waiting),

		      void *handle)

{

	int status;

	uint incr_fix;
@@ -486,7 +486,9 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, 
int

brcmf_sdcard_send_buf(struct brcmf_sdio_card *card, u32 addr, uint fn,

		      uint flags, u8 *buf, uint nbytes, void *pkt,

		      brcmf_sdio_cmplt_fn_t complete, void *handle)

		      void (*complete)(void *handle, int status,

				       bool sync_waiting),

		      void *handle)

{

	uint incr_fix;

	uint width;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ extern int brcmf_sdioh_detach(struct sdioh_info *sd) 


/* Configure callback to client when we receive client interrupt */

extern int

brcmf_sdioh_interrupt_register(struct sdioh_info *sd, sdioh_cb_fn_t fn,

brcmf_sdioh_interrupt_register(struct sdioh_info *sd, void (*fn)(void *),

			       void *argh)

{

	sd_trace(("%s: Entering\n", __func__));

drivers/staging/brcm80211/brcmfmac/dhd.h

+11 −11
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ 
#define BRCMF_EVENT_MSG_FLUSHTXQ	0x02

#define BRCMF_EVENT_MSG_GROUP		0x04



typedef struct brcmf_event_msg {

struct brcmf_event_msg {

	u16 version;

	u16 flags;

	u32 event_type;
@@ -145,7 +145,7 @@ typedef struct brcmf_event_msg { 
	u32 datalen;

	u8 addr[ETH_ALEN];

	char ifname[IFNAMSIZ];

} __packed brcmf_event_msg_t;

} __packed;



struct brcm_ethhdr {

	u16 subtype;
@@ -155,11 +155,11 @@ struct brcm_ethhdr { 
	u16 usr_subtype;

} __packed;



typedef struct brcmf_event {

struct brcmf_event {

	struct ethhdr eth;

	struct brcm_ethhdr hdr;

	struct brcmf_event_msg msg;

} __packed brcmf_event_t;

} __packed;



#define BRCMF_E_SET_SSID			0

#define BRCMF_E_JOIN				1
@@ -547,7 +547,7 @@ struct brcmf_pub { 
	bool iswl;		/* Dongle-resident driver is wl */

	unsigned long drv_version;	/* Version of dongle-resident driver */

	u8 mac[ETH_ALEN];			/* MAC address obtained from dongle */

	dngl_stats_t dstats;		/* Stats for dongle-based data */

	struct dngl_stats dstats;	/* Stats for dongle-based data */



	/* Additional stats for the bus level */

	unsigned long tx_packets;	/* Data packets sent to dongle */
@@ -609,10 +609,10 @@ struct brcmf_timeout { 
	u32 tick;		/* O/S tick time (usec) */

};



typedef struct {

struct bcmevent_name {

	uint event;

	const char *name;

} bcmevent_name_t;

};



#if defined(CONFIG_PM_SLEEP)

extern atomic_t brcmf_mmc_suspend;
@@ -704,7 +704,7 @@ extern uint brcmf_pktgen_len; 
#endif



extern u32 g_assert_type;

extern const bcmevent_name_t bcmevent_names[];

extern const struct bcmevent_name bcmevent_names[];

extern const int bcmevent_names_size;
@@ -808,7 +808,7 @@ extern int brcmf_timeout_expired(struct brcmf_timeout *tmo); 


extern int brcmf_ifname2idx(struct brcmf_info *drvr_priv, char *name);

extern int brcmf_c_host_event(struct brcmf_info *drvr_priv, int *idx,

			      void *pktdata, brcmf_event_msg_t *,

			      void *pktdata, struct brcmf_event_msg *,

			      void **data_ptr);



extern void brcmf_c_init(void);
@@ -885,7 +885,7 @@ struct brcmf_c_ioctl { 


#ifdef SDTEST

/* For pktgen iovar */

typedef struct brcmf_pktgen {

struct brcmf_pktgen {

	uint version;		/* To allow structure change tracking */

	uint freq;		/* Max ticks between tx/rx attempts */

	uint count;		/* Test packets to send/rcv each attempt */
@@ -898,7 +898,7 @@ typedef struct brcmf_pktgen { 
	uint numfail;		/* Count of test send failures */

	uint mode;		/* Test mode (type of test packets) */

	uint stop;		/* Stop after this many tx failures */

} brcmf_pktgen_t;

};



/* Version in case structure changes */

#define BRCMF_PKTGEN_VERSION	2

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+7 −5
Original line number Diff line number Diff line
@@ -449,7 +449,8 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf, 
}



#ifdef SHOW_EVENTS

static void brcmf_c_show_host_event(brcmf_event_msg_t *event, void *event_data)

static void

brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)

{

	uint i, status, reason;

	bool group = false, flush_txq = false, link = false;
@@ -756,10 +757,10 @@ static void brcmf_c_show_host_event(brcmf_event_msg_t *event, void *event_data) 


int

brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,

	      brcmf_event_msg_t *event, void **data_ptr)

		   struct brcmf_event_msg *event, void **data_ptr)

{

	/* check whether packet is a BRCM event pkt */

	brcmf_event_t *pvt_data = (brcmf_event_t *) pktdata;

	struct brcmf_event *pvt_data = (struct brcmf_event *) pktdata;

	char *event_data;

	u32 type, status;

	u16 flags;
@@ -781,12 +782,13 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, 
	event_data = *data_ptr;



	/* memcpy since BRCM event pkt may be unaligned. */

	memcpy(event, &pvt_data->msg, sizeof(brcmf_event_msg_t));

	memcpy(event, &pvt_data->msg, sizeof(struct brcmf_event_msg));



	type = get_unaligned_be32(&event->event_type);

	flags = get_unaligned_be16(&event->flags);

	status = get_unaligned_be32(&event->status);

	evlen = get_unaligned_be32(&event->datalen) + sizeof(brcmf_event_t);

	evlen = get_unaligned_be32(&event->datalen) +

		sizeof(struct brcmf_event);



	switch (type) {

	case BRCMF_E_IF: