Commit ce0f1b8c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: brcm80211: remove OFFSETOF macro 



Use the real 'offsetof' definition instead.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3ea2f4d6

drivers/staging/brcm80211/brcmfmac/bcmutils.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ void pktq_init(struct pktq *pq, int num_prec, int max_len) 


	/* pq is variable size; only zero out what's requested */

	bzero(pq,

	      OFFSETOF(struct pktq, q) + (sizeof(struct pktq_prec) * num_prec));

	      offsetof(struct pktq, q) + (sizeof(struct pktq_prec) * num_prec));



	pq->num_prec = (u16) num_prec;

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+4 −4
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ static int dhdsdio_readconsole(dhd_bus_t *bus) 
		return 0;



	/* Read console log struct */

	addr = bus->console_addr + OFFSETOF(hndrte_cons_t, log);

	addr = bus->console_addr + offsetof(hndrte_cons_t, log);

	rv = dhdsdio_membytes(bus, FALSE, addr, (u8 *)&c->log,

				sizeof(c->log));

	if (rv < 0)
@@ -4980,20 +4980,20 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen) 
	dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);



	/* Zero cbuf_index */

	addr = bus->console_addr + OFFSETOF(hndrte_cons_t, cbuf_idx);

	addr = bus->console_addr + offsetof(hndrte_cons_t, cbuf_idx);

	val = htol32(0);

	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)&val, sizeof(val));

	if (rv < 0)

		goto done;



	/* Write message into cbuf */

	addr = bus->console_addr + OFFSETOF(hndrte_cons_t, cbuf);

	addr = bus->console_addr + offsetof(hndrte_cons_t, cbuf);

	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)msg, msglen);

	if (rv < 0)

		goto done;



	/* Write length into vcons_in */

	addr = bus->console_addr + OFFSETOF(hndrte_cons_t, vcons_in);

	addr = bus->console_addr + offsetof(hndrte_cons_t, vcons_in);

	val = htol32(msglen);

	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)&val, sizeof(val));

	if (rv < 0)

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static s32 
wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action)

{

	s32 params_size =

	    (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params));

	    (WL_SCAN_PARAMS_FIXED_SIZE + offsetof(wl_iscan_params_t, params));

	struct wl_iscan_params *params;

	s32 err = 0;
@@ -707,7 +707,7 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action) 
	params->action = htod16(action);

	params->scan_duration = htod16(0);



	/* params_size += OFFSETOF(wl_iscan_params_t, params); */

	/* params_size += offsetof(wl_iscan_params_t, params); */

	err = wl_dev_iovar_setbuf(iscan->dev, "iscan", params, params_size,

				iscan->ioctl_buf, WLC_IOCTL_SMLEN);

	if (unlikely(err)) {

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+2 −2
Original line number Diff line number Diff line
@@ -3708,12 +3708,12 @@ int wl_iw_attach(struct net_device *dev, void *dhdp) 


#ifdef CSCAN

	params_size =

	    (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params)) +

	    (WL_SCAN_PARAMS_FIXED_SIZE + offsetof(wl_iscan_params_t, params)) +

	    (WL_NUMCHANNELS * sizeof(u16)) +

	    WL_SCAN_PARAMS_SSID_MAX * sizeof(wlc_ssid_t);

#else

	params_size =

	    (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_iscan_params_t, params));

	    (WL_SCAN_PARAMS_FIXED_SIZE + offsetof(wl_iscan_params_t, params));

#endif

	iscan = kmalloc(sizeof(iscan_info_t), GFP_KERNEL);

drivers/staging/brcm80211/include/bcmutils.h

+0 −3
Original line number Diff line number Diff line
@@ -456,9 +456,6 @@ extern "C" { 
	& ~((boundary) - 1))

#define	ISPOWEROF2(x)		((((x)-1)&(x)) == 0)

#define VALID_MASK(mask)	(!((mask) & ((mask) + 1)))

#ifndef OFFSETOF

#define	OFFSETOF(type, member)	((uint)(uintptr)&((type *)0)->member)

#endif				/* OFFSETOF */

#ifndef ARRAYSIZE

#define ARRAYSIZE(a)		(sizeof(a)/sizeof(a[0]))

#endif