staging: brcm80211: replace bcopy with memcpy (02160695) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -324,7 +324,7 @@ int bcmsdh_cis_read(void sdh, uint func, u8 cis, uint length)
	BCMSDH_ERROR(("%s: out of memory\n", __func__));		BCMSDH_ERROR(("%s: out of memory\n", __func__));
	return BCME_NOMEM;		return BCME_NOMEM;
	}		}
	bcopy(cis, tmp_buf, length);		memcpy(tmp_buf, cis, length);
	for (tmp_ptr = tmp_buf, ptr = cis; ptr < (cis + length - 4);		for (tmp_ptr = tmp_buf, ptr = cis; ptr < (cis + length - 4);
	tmp_ptr++) {		tmp_ptr++) {
	ptr += sprintf((char )ptr, "%.2x ", tmp_ptr & 0xff);		ptr += sprintf((char )ptr, "%.2x ", tmp_ptr & 0xff);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+20 −20

Original line number	Original line	Diff line number	Diff line
	@@ -441,7 +441,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,
	val_size = sizeof(int);		val_size = sizeof(int);

	if (plen >= (int)sizeof(int_val))		if (plen >= (int)sizeof(int_val))
	bcopy(params, &int_val, sizeof(int_val));		memcpy(&int_val, params, sizeof(int_val));

	bool_val = (int_val != 0) ? true : false;		bool_val = (int_val != 0) ? true : false;

	@@ -449,7 +449,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,
	switch (actionid) {		switch (actionid) {
	case IOV_GVAL(IOV_MSGLEVEL):		case IOV_GVAL(IOV_MSGLEVEL):
	int_val = (s32) sd_msglevel;		int_val = (s32) sd_msglevel;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_MSGLEVEL):		case IOV_SVAL(IOV_MSGLEVEL):
	@@ -458,7 +458,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_BLOCKMODE):		case IOV_GVAL(IOV_BLOCKMODE):
	int_val = (s32) si->sd_blockmode;		int_val = (s32) si->sd_blockmode;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_BLOCKMODE):		case IOV_SVAL(IOV_BLOCKMODE):
	@@ -472,7 +472,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,
	break;		break;
	}		}
	int_val = (s32) si->client_block_size[int_val];		int_val = (s32) si->client_block_size[int_val];
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_BLOCKSIZE):		case IOV_SVAL(IOV_BLOCKSIZE):
	@@ -514,12 +514,12 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_RXCHAIN):		case IOV_GVAL(IOV_RXCHAIN):
	int_val = false;		int_val = false;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_GVAL(IOV_DMA):		case IOV_GVAL(IOV_DMA):
	int_val = (s32) si->sd_use_dma;		int_val = (s32) si->sd_use_dma;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_DMA):		case IOV_SVAL(IOV_DMA):
	@@ -528,7 +528,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_USEINTS):		case IOV_GVAL(IOV_USEINTS):
	int_val = (s32) si->use_client_ints;		int_val = (s32) si->use_client_ints;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_USEINTS):		case IOV_SVAL(IOV_USEINTS):
	@@ -542,7 +542,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_DIVISOR):		case IOV_GVAL(IOV_DIVISOR):
	int_val = (u32) sd_divisor;		int_val = (u32) sd_divisor;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_DIVISOR):		case IOV_SVAL(IOV_DIVISOR):
	@@ -551,7 +551,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_POWER):		case IOV_GVAL(IOV_POWER):
	int_val = (u32) sd_power;		int_val = (u32) sd_power;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_POWER):		case IOV_SVAL(IOV_POWER):
	@@ -560,7 +560,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_CLOCK):		case IOV_GVAL(IOV_CLOCK):
	int_val = (u32) sd_clock;		int_val = (u32) sd_clock;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_CLOCK):		case IOV_SVAL(IOV_CLOCK):
	@@ -569,7 +569,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_SDMODE):		case IOV_GVAL(IOV_SDMODE):
	int_val = (u32) sd_sdmode;		int_val = (u32) sd_sdmode;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_SDMODE):		case IOV_SVAL(IOV_SDMODE):
	@@ -578,7 +578,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_HISPEED):		case IOV_GVAL(IOV_HISPEED):
	int_val = (u32) sd_hiok;		int_val = (u32) sd_hiok;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_HISPEED):		case IOV_SVAL(IOV_HISPEED):
	@@ -587,12 +587,12 @@ sdioh_iovar_op(sdioh_info_t si, const char name,

	case IOV_GVAL(IOV_NUMINTS):		case IOV_GVAL(IOV_NUMINTS):
	int_val = (s32) si->intrcount;		int_val = (s32) si->intrcount;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_GVAL(IOV_NUMLOCALINTS):		case IOV_GVAL(IOV_NUMLOCALINTS):
	int_val = (s32) 0;		int_val = (s32) 0;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_GVAL(IOV_HOSTREG):		case IOV_GVAL(IOV_HOSTREG):
	@@ -621,7 +621,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,
	int_val = 32; /* sdioh_sdmmc_rreg(si,		int_val = 32; /* sdioh_sdmmc_rreg(si,
	sd_ptr->offset); */		sd_ptr->offset); */

	bcopy(&int_val, arg, sizeof(int_val));		memcpy(arg, &int_val, sizeof(int_val));
	break;		break;
	}		}

	@@ -657,7 +657,7 @@ sdioh_iovar_op(sdioh_info_t si, const char name,
	}		}

	int_val = (int)data;		int_val = (int)data;
	bcopy(&int_val, arg, sizeof(int_val));		memcpy(arg, &int_val, sizeof(int_val));
	break;		break;
	}		}

	@@ -1048,14 +1048,14 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,

	/* For a write, copy the buffer data into the packet. */		/* For a write, copy the buffer data into the packet. */
	if (write)		if (write)
	bcopy(buffer, mypkt->data, buflen_u);		memcpy(mypkt->data, buffer, buflen_u);

	Status =		Status =
	sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);		sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);

	/* For a read, copy the packet data back to the buffer. */		/* For a read, copy the packet data back to the buffer. */
	if (!write)		if (!write)
	bcopy(mypkt->data, buffer, buflen_u);		memcpy(buffer, mypkt->data, buflen_u);

	pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);		pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);
	} else if (((u32) (pkt->data) & DMA_ALIGN_MASK) != 0) {		} else if (((u32) (pkt->data) & DMA_ALIGN_MASK) != 0) {
	@@ -1075,14 +1075,14 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,

	/* For a write, copy the buffer data into the packet. */		/* For a write, copy the buffer data into the packet. */
	if (write)		if (write)
	bcopy(pkt->data, mypkt->data, pkt->len);		memcpy(mypkt->data, pkt->data, pkt->len);

	Status =		Status =
	sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);		sdioh_request_packet(sd, fix_inc, write, func, addr, mypkt);

	/* For a read, copy the packet data back to the buffer. */		/* For a read, copy the packet data back to the buffer. */
	if (!write)		if (!write)
	bcopy(mypkt->data, pkt->data, mypkt->len);		memcpy(pkt->data, mypkt->data, mypkt->len);

	pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);		pkt_buf_free_skb(sd->osh, mypkt, write ? true : false);
	} else { /* case 3: We have a packet and		} else { /* case 3: We have a packet and

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -286,7 +286,7 @@ dhd_prot_ioctl(dhd_pub_t dhd, int ifidx, wl_ioctl_t ioc, void *buf, int len)

	slen = strlen("wme_dp") + 1;		slen = strlen("wme_dp") + 1;
	if (len >= (int)(slen + sizeof(int)))		if (len >= (int)(slen + sizeof(int)))
	bcopy(((char *)buf + slen), &val, sizeof(int));		memcpy(&val, (char *)buf + slen, sizeof(int));
	dhd->wme_dp = (u8) ltoh32(val);		dhd->wme_dp = (u8) ltoh32(val);
	}		}

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -214,7 +214,7 @@ dhd_doiovar(dhd_pub_t dhd_pub, const bcm_iovar_t vi, u32 actionid,
	goto exit;		goto exit;

	if (plen >= (int)sizeof(int_val))		if (plen >= (int)sizeof(int_val))
	bcopy(params, &int_val, sizeof(int_val));		memcpy(&int_val, params, sizeof(int_val));

	switch (actionid) {		switch (actionid) {
	case IOV_GVAL(IOV_VERSION):		case IOV_GVAL(IOV_VERSION):
	@@ -224,7 +224,7 @@ dhd_doiovar(dhd_pub_t dhd_pub, const bcm_iovar_t vi, u32 actionid,

	case IOV_GVAL(IOV_MSGLEVEL):		case IOV_GVAL(IOV_MSGLEVEL):
	int_val = (s32) dhd_msg_level;		int_val = (s32) dhd_msg_level;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_MSGLEVEL):		case IOV_SVAL(IOV_MSGLEVEL):
	@@ -239,12 +239,12 @@ dhd_doiovar(dhd_pub_t dhd_pub, const bcm_iovar_t vi, u32 actionid,

	case IOV_GVAL(IOV_BCMERROR):		case IOV_GVAL(IOV_BCMERROR):
	int_val = (s32) dhd_pub->bcmerror;		int_val = (s32) dhd_pub->bcmerror;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_GVAL(IOV_WDTICK):		case IOV_GVAL(IOV_WDTICK):
	int_val = (s32) dhd_watchdog_ms;		int_val = (s32) dhd_watchdog_ms;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_WDTICK):		case IOV_SVAL(IOV_WDTICK):
	@@ -262,7 +262,7 @@ dhd_doiovar(dhd_pub_t dhd_pub, const bcm_iovar_t vi, u32 actionid,
	#ifdef DHD_DEBUG		#ifdef DHD_DEBUG
	case IOV_GVAL(IOV_DCONSOLE_POLL):		case IOV_GVAL(IOV_DCONSOLE_POLL):
	int_val = (s32) dhd_console_ms;		int_val = (s32) dhd_console_ms;
	bcopy(&int_val, arg, val_size);		memcpy(arg, &int_val, val_size);
	break;		break;

	case IOV_SVAL(IOV_DCONSOLE_POLL):		case IOV_SVAL(IOV_DCONSOLE_POLL):
	@@ -290,7 +290,7 @@ dhd_doiovar(dhd_pub_t dhd_pub, const bcm_iovar_t vi, u32 actionid,

	case IOV_GVAL(IOV_IOCTLTIMEOUT):{		case IOV_GVAL(IOV_IOCTLTIMEOUT):{
	int_val = (s32) dhd_os_get_ioctl_resp_timeout();		int_val = (s32) dhd_os_get_ioctl_resp_timeout();
	bcopy(&int_val, arg, sizeof(int_val));		memcpy(arg, &int_val, sizeof(int_val));
	break;		break;
	}		}

	@@ -1498,7 +1498,7 @@ int dhd_iscan_delete_bss(void dhdp, void addr, iscan_buf_t *iscan_skip)
	(bi->length));		(bi->length));
	/*		/*
	if(bi && bi_new) {		if(bi && bi_new) {
	bcopy(bi, bi_new, results->buflen -		memcpy(bi_new, bi, results->buflen -
	dtoh32(bi_new->length));		dtoh32(bi_new->length));
	results->buflen -= dtoh32(bi_new->length);		results->buflen -= dtoh32(bi_new->length);
	}		}
	@@ -1522,7 +1522,7 @@ int dhd_iscan_delete_bss(void dhdp, void addr, iscan_buf_t *iscan_skip)
	(wl_bss_info_t *)((unsigned long)bi +		(wl_bss_info_t *)((unsigned long)bi +
	dtoh32		dtoh32
	(bi->length));		(bi->length));
	bcopy(bi, bi_new,		memcpy(bi_new, bi,
	dtoh32		dtoh32
	(bi->length));		(bi->length));
	bi_new =		bi_new =

drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -149,9 +149,8 @@ int dhd_custom_get_mac_address(unsigned char *buf)
	#ifdef EXAMPLE_GET_MAC		#ifdef EXAMPLE_GET_MAC
	/* EXAMPLE code */		/* EXAMPLE code */
	{		{
	u8 ea_example[ETH_ALEN] = {		u8 ea_example[ETH_ALEN] = {0x00, 0x11, 0x22, 0x33, 0x44, 0xFF};
	{0x00, 0x11, 0x22, 0x33, 0x44, 0xFF} };		memcpy(buf, ea_example, ETH_ALEN);
	bcopy((char *)ea_example, buf, ETH_ALEN);
	}		}
	#endif /* EXAMPLE_GET_MAC */		#endif /* EXAMPLE_GET_MAC */