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

Commit 5e8149f5 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: error messages should not be suppressed 



The call to brcmf_dbg(ERROR, ...) only resulted in a log message
when compiled with -DDEBUG. Error messages are valuable for resolving
issues so this patch replaces it with brcmf_err(...) so they always
end up in the log.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dc5cbdfd

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+7 −8
Original line number Diff line number Diff line
@@ -67,9 +67,8 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev) 
	u8 data;

	unsigned long flags;



	brcmf_dbg(TRACE, "Entering\n");

	brcmf_dbg(TRACE, "Entering: irq %d\n", sdiodev->irq);



	brcmf_dbg(ERROR, "requesting irq %d\n", sdiodev->irq);

	ret = request_irq(sdiodev->irq, brcmf_sdio_irqhandler,

			  sdiodev->irq_flags, "brcmf_oob_intr",

			  &sdiodev->func[1]->dev);
@@ -184,7 +183,7 @@ brcmf_sdcard_set_sbaddr_window(struct brcmf_sdio_dev *sdiodev, u32 address) 
		} while (err != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);



		if (err) {

			brcmf_dbg(ERROR, "failed at addr:0x%0x\n",

			brcmf_err("failed at addr:0x%0x\n",

				  SBSDIO_FUNC1_SBADDRLOW + i);

			break;

		}
@@ -246,7 +245,7 @@ brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr, 
	} while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);



	if (ret != 0)

		brcmf_dbg(ERROR, "failed with %d\n", ret);

		brcmf_err("failed with %d\n", ret);



	return ret;

}
@@ -340,7 +339,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 


	mypkt = brcmu_pkt_buf_get_skb(nbytes);

	if (!mypkt) {

		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",

		brcmf_err("brcmu_pkt_buf_get_skb failed: len %d\n",

			  nbytes);

		return -EIO;

	}
@@ -409,7 +408,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 


	mypkt = brcmu_pkt_buf_get_skb(nbytes);

	if (!mypkt) {

		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",

		brcmf_err("brcmu_pkt_buf_get_skb failed: len %d\n",

			  nbytes);

		return -EIO;

	}
@@ -472,7 +471,7 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr, 


	mypkt = brcmu_pkt_buf_get_skb(nbytes);

	if (!mypkt) {

		brcmf_dbg(ERROR, "brcmu_pkt_buf_get_skb failed: len %d\n",

		brcmf_err("brcmu_pkt_buf_get_skb failed: len %d\n",

			  nbytes);

		return -EIO;

	}
@@ -519,7 +518,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
	/* try to attach to the target device */

	sdiodev->bus = brcmf_sdbrcm_probe(regs, sdiodev);

	if (!sdiodev->bus) {

		brcmf_dbg(ERROR, "device attach failed\n");

		brcmf_err("device attach failed\n");

		ret = -ENODEV;

		goto out;

	}

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+21 −23
Original line number Diff line number Diff line
@@ -107,15 +107,13 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev, 
				/* Enable Function 2 */

				err_ret = sdio_enable_func(sdfunc);

				if (err_ret)

					brcmf_dbg(ERROR,

						  "enable F2 failed:%d\n",

					brcmf_err("enable F2 failed:%d\n",

						  err_ret);

			} else {

				/* Disable Function 2 */

				err_ret = sdio_disable_func(sdfunc);

				if (err_ret)

					brcmf_dbg(ERROR,

						  "Disable F2 failed:%d\n",

					brcmf_err("Disable F2 failed:%d\n",

						  err_ret);

			}

		}
@@ -129,7 +127,7 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev, 
		sdio_writeb(sdfunc, *byte, regaddr, &err_ret);

		kfree(sdfunc);

	} else if (regaddr < 0xF0) {

		brcmf_dbg(ERROR, "F0 Wr:0x%02x: write disallowed\n", regaddr);

		brcmf_err("F0 Wr:0x%02x: write disallowed\n", regaddr);

		err_ret = -EPERM;

	} else {

		sdio_f0_writeb(sdfunc, *byte, regaddr, &err_ret);
@@ -166,7 +164,7 @@ int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint func, 
	}



	if (err_ret)

		brcmf_dbg(ERROR, "Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",

		brcmf_err("Failed to %s byte F%d:@0x%05x=%02x, Err: %d\n",

			  rw ? "write" : "read", func, regaddr, *byte, err_ret);



	return err_ret;
@@ -179,7 +177,7 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, 
	int err_ret = -EIO;



	if (func == 0) {

		brcmf_dbg(ERROR, "Only CMD52 allowed to F0\n");

		brcmf_err("Only CMD52 allowed to F0\n");

		return -EINVAL;

	}
@@ -198,7 +196,7 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, 
			sdio_writew(sdiodev->func[func], (*word & 0xFFFF),

				    addr, &err_ret);

		else

			brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes);

			brcmf_err("Invalid nbytes: %d\n", nbytes);

	} else {		/* CMD52 Read */

		if (nbytes == 4)

			*word = sdio_readl(sdiodev->func[func], addr, &err_ret);
@@ -206,11 +204,11 @@ int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, 
			*word = sdio_readw(sdiodev->func[func], addr,

					   &err_ret) & 0xFFFF;

		else

			brcmf_dbg(ERROR, "Invalid nbytes: %d\n", nbytes);

			brcmf_err("Invalid nbytes: %d\n", nbytes);

	}



	if (err_ret)

		brcmf_dbg(ERROR, "Failed to %s word, Err: 0x%08x\n",

		brcmf_err("Failed to %s word, Err: 0x%08x\n",

			  rw ? "write" : "read", err_ret);



	return err_ret;
@@ -270,7 +268,7 @@ brcmf_sdioh_request_chain(struct brcmf_sdio_dev *sdiodev, uint fix_inc, 
		err_ret = brcmf_sdioh_request_data(sdiodev, write, fifo, func,

						   addr, pkt, pkt_len);

		if (err_ret) {

			brcmf_dbg(ERROR, "%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",

			brcmf_err("%s FAILED %p[%d], addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",

				  write ? "TX" : "RX", pkt, SGCount, addr,

				  pkt_len, err_ret);

		} else {
@@ -315,7 +313,7 @@ int brcmf_sdioh_request_buffer(struct brcmf_sdio_dev *sdiodev, 
	status = brcmf_sdioh_request_data(sdiodev, write, fifo, func,

					   addr, pkt, pkt_len);

	if (status) {

		brcmf_dbg(ERROR, "%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",

		brcmf_err("%s FAILED %p, addr=0x%05x, pkt_len=%d, ERR=0x%08x\n",

			  write ? "TX" : "RX", pkt, addr, pkt_len, status);

	} else {

		brcmf_dbg(TRACE, "%s xfr'd %p, addr=0x%05x, len=%d\n",
@@ -336,7 +334,7 @@ static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr) 
	for (i = 0; i < 3; i++) {

		regdata = brcmf_sdio_regrl(sdiodev, regaddr, &ret);

		if (ret != 0)

			brcmf_dbg(ERROR, "Can't read!\n");

			brcmf_err("Can't read!\n");



		*ptr++ = (u8) regdata;

		regaddr++;
@@ -374,7 +372,7 @@ static int brcmf_sdioh_enablefuncs(struct brcmf_sdio_dev *sdiodev) 
	/* Enable Function 1 */

	err_ret = sdio_enable_func(sdiodev->func[1]);

	if (err_ret)

		brcmf_dbg(ERROR, "Failed to enable F1 Err: 0x%08x\n", err_ret);

		brcmf_err("Failed to enable F1 Err: 0x%08x\n", err_ret);



	return false;

}
@@ -394,13 +392,13 @@ int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev) 


	err_ret = sdio_set_block_size(sdiodev->func[1], SDIO_FUNC1_BLOCKSIZE);

	if (err_ret) {

		brcmf_dbg(ERROR, "Failed to set F1 blocksize\n");

		brcmf_err("Failed to set F1 blocksize\n");

		goto out;

	}



	err_ret = sdio_set_block_size(sdiodev->func[2], SDIO_FUNC2_BLOCKSIZE);

	if (err_ret) {

		brcmf_dbg(ERROR, "Failed to set F2 blocksize\n");

		brcmf_err("Failed to set F2 blocksize\n");

		goto out;

	}
@@ -434,7 +432,7 @@ static int brcmf_sdio_getintrcfg(struct brcmf_sdio_dev *sdiodev) 
	struct brcmf_sdio_oobirq *oobirq_entry;



	if (list_empty(&oobirq_lh)) {

		brcmf_dbg(ERROR, "no valid oob irq resource\n");

		brcmf_err("no valid oob irq resource\n");

		return -ENXIO;

	}
@@ -508,7 +506,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");

	err = brcmf_sdio_probe(sdiodev);

	if (err) {

		brcmf_dbg(ERROR, "F2 error, probe failed %d...\n", err);

		brcmf_err("F2 error, probe failed %d...\n", err);

		goto fail;

	}

	brcmf_dbg(TRACE, "F2 init completed...\n");
@@ -564,13 +562,13 @@ static int brcmf_sdio_suspend(struct device *dev) 


	sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]);

	if (!(sdio_flags & MMC_PM_KEEP_POWER)) {

		brcmf_dbg(ERROR, "Host can't keep power while suspended\n");

		brcmf_err("Host can't keep power while suspended\n");

		return -EINVAL;

	}



	ret = sdio_set_host_pm_flags(sdiodev->func[1], MMC_PM_KEEP_POWER);

	if (ret) {

		brcmf_dbg(ERROR, "Failed to set pm_flags\n");

		brcmf_err("Failed to set pm_flags\n");

		return ret;

	}
@@ -635,7 +633,7 @@ static int brcmf_sdio_pd_probe(struct platform_device *pdev) 
	ret = sdio_register_driver(&brcmf_sdmmc_driver);



	if (ret)

		brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);

		brcmf_err("sdio_register_driver failed: %d\n", ret);



	return ret;

}
@@ -665,7 +663,7 @@ void brcmf_sdio_init(void) 
	ret = platform_driver_register(&brcmf_sdio_pd);



	if (ret)

		brcmf_dbg(ERROR, "platform_driver_register failed: %d\n", ret);

		brcmf_err("platform_driver_register failed: %d\n", ret);

}

#else

void brcmf_sdio_exit(void)
@@ -684,6 +682,6 @@ void brcmf_sdio_init(void) 
	ret = sdio_register_driver(&brcmf_sdmmc_driver);



	if (ret)

		brcmf_dbg(ERROR, "sdio_register_driver failed: %d\n", ret);

		brcmf_err("sdio_register_driver failed: %d\n", ret);

}

#endif		/* CONFIG_BRCMFMAC_SDIO_OOB */

drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

+7 −7
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 


	ret = brcmf_proto_cdc_msg(drvr);

	if (ret < 0) {

		brcmf_dbg(ERROR, "brcmf_proto_cdc_msg failed w/status %d\n",

		brcmf_err("brcmf_proto_cdc_msg failed w/status %d\n",

			  ret);

		goto done;

	}
@@ -193,7 +193,7 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	if ((id < prot->reqid) && (++retries < RETRIES))

		goto retry;

	if (id != prot->reqid) {

		brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n",

		brcmf_err("%s: unexpected request id %d (expected %d)\n",

			  brcmf_ifname(drvr, ifidx), id, prot->reqid);

		ret = -EINVAL;

		goto done;
@@ -255,7 +255,7 @@ int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	id = (flags & CDC_DCMD_ID_MASK) >> CDC_DCMD_ID_SHIFT;



	if (id != prot->reqid) {

		brcmf_dbg(ERROR, "%s: unexpected request id %d (expected %d)\n",

		brcmf_err("%s: unexpected request id %d (expected %d)\n",

			  brcmf_ifname(drvr, ifidx), id, prot->reqid);

		ret = -EINVAL;

		goto done;
@@ -317,7 +317,7 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx, 
	/* Pop BDC header used to convey priority for buses that don't */



	if (pktbuf->len < BDC_HEADER_LEN) {

		brcmf_dbg(ERROR, "rx data too short (%d < %d)\n",

		brcmf_err("rx data too short (%d < %d)\n",

			  pktbuf->len, BDC_HEADER_LEN);

		return -EBADE;

	}
@@ -326,13 +326,13 @@ int brcmf_proto_hdrpull(struct device *dev, int *ifidx, 


	*ifidx = BDC_GET_IF_IDX(h);

	if (*ifidx >= BRCMF_MAX_IFS) {

		brcmf_dbg(ERROR, "rx data ifnum out of range (%d)\n", *ifidx);

		brcmf_err("rx data ifnum out of range (%d)\n", *ifidx);

		return -EBADE;

	}



	if (((h->flags & BDC_FLAG_VER_MASK) >> BDC_FLAG_VER_SHIFT) !=

	    BDC_PROTO_VER) {

		brcmf_dbg(ERROR, "%s: non-BDC packet received, flags 0x%x\n",

		brcmf_err("%s: non-BDC packet received, flags 0x%x\n",

			  brcmf_ifname(drvr, *ifidx), h->flags);

		return -EBADE;

	}
@@ -361,7 +361,7 @@ int brcmf_proto_attach(struct brcmf_pub *drvr) 


	/* ensure that the msg buf directly follows the cdc msg struct */

	if ((unsigned long)(&cdc->msg + 1) != (unsigned long)cdc->buf) {

		brcmf_dbg(ERROR, "struct brcmf_proto is not correctly defined\n");

		brcmf_err("struct brcmf_proto is not correctly defined\n");

		goto fail;

	}

drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

+20 −20
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
		p = discard_oldest ? brcmu_pktq_pdeq(q, eprec) :

			brcmu_pktq_pdeq_tail(q, eprec);

		if (p == NULL)

			brcmf_dbg(ERROR, "brcmu_pktq_penq() failed, oldest %d\n",

			brcmf_err("brcmu_pktq_penq() failed, oldest %d\n",

				  discard_oldest);



		brcmu_pkt_buf_free_skb(p);
@@ -89,7 +89,7 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, 
	/* Enqueue */

	p = brcmu_pktq_penq(q, prec, pkt);

	if (p == NULL)

		brcmf_dbg(ERROR, "brcmu_pktq_penq() failed\n");

		brcmf_err("brcmu_pktq_penq() failed\n");



	return p != NULL;

}
@@ -99,12 +99,12 @@ static int brcmf_c_pattern_atoh(char *src, char *dst) 
{

	int i;

	if (strncmp(src, "0x", 2) != 0 && strncmp(src, "0X", 2) != 0) {

		brcmf_dbg(ERROR, "Mask invalid format. Needs to start with 0x\n");

		brcmf_err("Mask invalid format. Needs to start with 0x\n");

		return -EINVAL;

	}

	src = src + 2;		/* Skip past 0x */

	if (strlen(src) % 2 != 0) {

		brcmf_dbg(ERROR, "Mask invalid format. Length must be even.\n");

		brcmf_err("Mask invalid format. Length must be even.\n");

		return -EINVAL;

	}

	for (i = 0; *src != '\0'; i++) {
@@ -139,7 +139,7 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_if *ifp, char *arg, int enable, 
	argv = strsep(&arg_save, " ");



	if (argv == NULL) {

		brcmf_dbg(ERROR, "No args provided\n");

		brcmf_err("No args provided\n");

		goto fail;

	}
@@ -154,12 +154,12 @@ brcmf_c_pktfilter_offload_enable(struct brcmf_if *ifp, char *arg, int enable, 
	err = brcmf_fil_iovar_data_set(ifp, "pkt_filter_enable", &enable_parm,

				       sizeof(enable_parm));

	if (err)

		brcmf_dbg(ERROR, "Set pkt_filter_enable error (%d)\n", err);

		brcmf_err("Set pkt_filter_enable error (%d)\n", err);



	/* Control the master mode */

	err = brcmf_fil_iovar_int_set(ifp, "pkt_filter_mode", master_mode);

	if (err)

		brcmf_dbg(ERROR, "Set pkt_filter_mode error (%d)\n", err);

		brcmf_err("Set pkt_filter_mode error (%d)\n", err);



fail:

	kfree(arg_org);
@@ -191,14 +191,14 @@ static void brcmf_c_pktfilter_offload_set(struct brcmf_if *ifp, char *arg) 
	while (argv[i]) {

		i++;

		if (i >= 8) {

			brcmf_dbg(ERROR, "Too many parameters\n");

			brcmf_err("Too many parameters\n");

			goto fail;

		}

		argv[i] = strsep(&arg_save, " ");

	}



	if (i != 6) {

		brcmf_dbg(ERROR, "Not enough args provided %d\n", i);

		brcmf_err("Not enough args provided %d\n", i);

		goto fail;

	}
@@ -233,7 +233,7 @@ static void brcmf_c_pktfilter_offload_set(struct brcmf_if *ifp, char *arg) 
		(char *)&pkt_filter->u.pattern.mask_and_pattern[mask_size]);



	if (mask_size != pattern_size) {

		brcmf_dbg(ERROR, "Mask and pattern not the same size\n");

		brcmf_err("Mask and pattern not the same size\n");

		goto fail;

	}
@@ -245,7 +245,7 @@ static void brcmf_c_pktfilter_offload_set(struct brcmf_if *ifp, char *arg) 
	err = brcmf_fil_iovar_data_set(ifp, "pkt_filter_add", pkt_filter,

				       buf_len);

	if (err)

		brcmf_dbg(ERROR, "Set pkt_filter_add error (%d)\n", err);

		brcmf_err("Set pkt_filter_add error (%d)\n", err);



fail:

	kfree(arg_org);
@@ -266,7 +266,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,

				       sizeof(ifp->mac_addr));

	if (err < 0) {

		brcmf_dbg(ERROR, "Retreiving cur_etheraddr failed, %d\n",

		brcmf_err("Retreiving cur_etheraddr failed, %d\n",

			  err);

		goto done;

	}
@@ -277,14 +277,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	strcpy(buf, "ver");

	err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));

	if (err < 0) {

		brcmf_dbg(ERROR, "Retreiving version information failed, %d\n",

		brcmf_err("Retreiving version information failed, %d\n",

			  err);

		goto done;

	}

	ptr = (char *)buf;

	strsep(&ptr, "\n");

	/* Print fw version info */

	brcmf_dbg(ERROR, "Firmware version = %s\n", buf);

	brcmf_err("Firmware version = %s\n", buf);



	/*

	 * Setup timeout if Beacons are lost and roam is off to report
@@ -293,7 +293,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_int_set(ifp, "bcn_timeout",

				      BRCMF_DEFAULT_BCN_TIMEOUT);

	if (err) {

		brcmf_dbg(ERROR, "bcn_timeout error (%d)\n", err);

		brcmf_err("bcn_timeout error (%d)\n", err);

		goto done;

	}
@@ -302,7 +302,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	 */

	err = brcmf_fil_iovar_int_set(ifp, "roam_off", 1);

	if (err) {

		brcmf_dbg(ERROR, "roam_off error (%d)\n", err);

		brcmf_err("roam_off error (%d)\n", err);

		goto done;

	}
@@ -310,14 +310,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,

				       BRCMF_EVENTING_MASK_LEN);

	if (err) {

		brcmf_dbg(ERROR, "Get event_msgs error (%d)\n", err);

		brcmf_err("Get event_msgs error (%d)\n", err);

		goto done;

	}

	setbit(eventmask, BRCMF_E_IF);

	err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,

				       BRCMF_EVENTING_MASK_LEN);

	if (err) {

		brcmf_dbg(ERROR, "Set event_msgs error (%d)\n", err);

		brcmf_err("Set event_msgs error (%d)\n", err);

		goto done;

	}
@@ -325,7 +325,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,

				    BRCMF_DEFAULT_SCAN_CHANNEL_TIME);

	if (err) {

		brcmf_dbg(ERROR, "BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",

		brcmf_err("BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",

			  err);

		goto done;

	}
@@ -334,7 +334,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,

				    BRCMF_DEFAULT_SCAN_UNASSOC_TIME);

	if (err) {

		brcmf_dbg(ERROR, "BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",

		brcmf_err("BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",

			  err);

		goto done;

	}

drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h

+18 −15
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define _BRCMF_DBG_H_



/* message levels */

#define BRCMF_ERROR_VAL	0x0001

#define BRCMF_TRACE_VAL	0x0002

#define BRCMF_INFO_VAL	0x0004

#define BRCMF_DATA_VAL	0x0008
@@ -33,22 +32,26 @@ 
#define BRCMF_FIL_VAL	0x1000

#define BRCMF_USB_VAL	0x2000



/* Macro for error messages. net_ratelimit() is used when driver

 * debugging is not selected. When debugging the driver error

 * messages are as important as other tracing or even more so.

 */

#ifdef CONFIG_BRCMDBG

#define brcmf_err(fmt, ...)	pr_err("%s: " fmt, __func__, ##__VA_ARGS__)

#else

#define brcmf_err(fmt, ...)						\

	do {								\

		if (net_ratelimit())					\

			pr_err("%s: " fmt, __func__, ##__VA_ARGS__);	\

	} while (0)

#endif



#if defined(DEBUG)



#define brcmf_dbg(level, fmt, ...)				\

do {								\

	if (BRCMF_ERROR_VAL == BRCMF_##level##_VAL) {			\

		if (brcmf_msg_level & BRCMF_##level##_VAL) {		\

			if (net_ratelimit())				\

				pr_debug("%s: " fmt,			\

					 __func__, ##__VA_ARGS__);	\

		}							\

	} else {							\

		if (brcmf_msg_level & BRCMF_##level##_VAL) {		\

			pr_debug("%s: " fmt,				\

				 __func__, ##__VA_ARGS__);		\

		}							\

	}								\

	if (brcmf_msg_level & BRCMF_##level##_VAL)		\

		pr_debug("%s: " fmt, __func__, ##__VA_ARGS__);	\

} while (0)



#define BRCMF_DATA_ON()		(brcmf_msg_level & BRCMF_DATA_VAL)