Commit 6f7d7362 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: void * cleanup in fullmac 



Remove improper usage of void * in dhd_linux.c and dhd_sdio.c

Reported-by: default avatarJulian Calaby <julian.calaby@gmail.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f6b1dde

drivers/staging/brcm80211/brcmfmac/dhd.h

+3 −2
Original line number Diff line number Diff line
@@ -760,8 +760,9 @@ extern int brcmf_c_host_event(struct brcmf_info *drvr_priv, int *idx, 


extern void brcmf_c_init(void);



extern int brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, void *handle,

		      char *name, u8 *mac_addr, u32 flags, u8 bssidx);

extern int brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx,

			struct net_device *net, char *name, u8 *mac_addr,

			u32 flags, u8 bssidx);

extern void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx);



/* Send packet to dongle via data channel */

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+7 −7
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr, 
		return -1;



	if (cmd == SIOCETHTOOL)

		return brcmf_ethtool(drvr_priv, (void *)ifr->ifr_data);

		return brcmf_ethtool(drvr_priv, ifr->ifr_data);



	if (cmd != SIOCDEVPRIVATE)

		return -EOPNOTSUPP;
@@ -1140,12 +1140,12 @@ static int brcmf_netdev_open(struct net_device *net) 
}



int

brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, void *handle, char *name,

	   u8 *mac_addr, u32 flags, u8 bssidx)

brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, struct net_device *net,

	     char *name, u8 *mac_addr, u32 flags, u8 bssidx)

{

	struct brcmf_if *ifp;



	BRCMF_TRACE(("%s: idx %d, handle->%p\n", __func__, ifidx, handle));

	BRCMF_TRACE(("%s: idx %d, handle->%p\n", __func__, ifidx, net));



	ifp = drvr_priv->iflist[ifidx];

	if (!ifp) {
@@ -1163,12 +1163,12 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, void *handle, char *name, 
	if (mac_addr != NULL)

		memcpy(&ifp->mac_addr, mac_addr, ETH_ALEN);



	if (handle == NULL) {

	if (net == NULL) {

		ifp->state = BRCMF_E_IF_ADD;

		ifp->idx = ifidx;

		wake_up(&drvr_priv->sysioc_waitq);

	} else

		ifp->net = (struct net_device *)handle;

		ifp->net = net;



	return 0;

}
@@ -1228,7 +1228,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen) 
			strcat(net->name, "%d");

	}



	if (brcmf_add_if(drvr_priv, 0, (void *)net, net->name, NULL, 0, 0) ==

	if (brcmf_add_if(drvr_priv, 0, net, net->name, NULL, 0, 0) ==

	    BRCMF_BAD_IF)

		goto fail;

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+3 −3
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static int brcmf_sdbrcm_send_buf(struct brcmf_bus *bus, u32 addr, uint fn, 
			       uint flags, u8 *buf, uint nbytes,

			       struct sk_buff *pkt);



static bool brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus, void *card);

static bool brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus);

static int  _brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus);



static int brcmf_sdbrcm_download_code_file(struct brcmf_bus *bus);
@@ -3100,7 +3100,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) 


	/* try to download image and nvram to the dongle */

	if (drvr->busstate == BRCMF_BUS_DOWN) {

		if (!(brcmf_sdbrcm_download_firmware(bus, bus->sdiodev)))

		if (!(brcmf_sdbrcm_download_firmware(bus)))

			return -1;

	}
@@ -5122,7 +5122,7 @@ static bool brcmf_sdbrcm_probe_init(struct brcmf_bus *bus) 
}



static bool

brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus, void *card)

brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)

{

	bool ret;