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

Commit 1a103803 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove BRCMF_SD_* debug macros from brcmfmac 



Use unified debug macros BRCMF_* in fullmac.

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 23eec9e1

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+13 −37
Original line number Original line Diff line number Diff line
@@ -34,28 +34,6 @@ 




#define SDIOH_API_ACCESS_RETRY_LIMIT	2

#define SDIOH_API_ACCESS_RETRY_LIMIT	2





#define BRCMF_SD_ERROR_VAL	0x0001	/* Error */

#define BRCMF_SD_INFO_VAL		0x0002	/* Info */





#ifdef BCMDBG

#define BRCMF_SD_ERROR(x) \

	do { \

		if ((brcmf_sdio_msglevel & BRCMF_SD_ERROR_VAL) && \

		    net_ratelimit()) \

			printk x; \

	} while (0)

#define BRCMF_SD_INFO(x)	\

	do { \

		if ((brcmf_sdio_msglevel & BRCMF_SD_INFO_VAL) && \

		    net_ratelimit()) \

			printk x; \

	} while (0)

#else				/* BCMDBG */

#define BRCMF_SD_ERROR(x)

#define BRCMF_SD_INFO(x)

#endif				/* BCMDBG */



#define SDIOH_CMD_TYPE_NORMAL   0	/* Normal command */

#define SDIOH_CMD_TYPE_NORMAL   0	/* Normal command */

#define SDIOH_CMD_TYPE_APPEND   1	/* Append command */

#define SDIOH_CMD_TYPE_APPEND   1	/* Append command */

#define SDIOH_CMD_TYPE_CUTTHRU  2	/* Cut-through command */

#define SDIOH_CMD_TYPE_CUTTHRU  2	/* Cut-through command */
@@ -72,8 +50,6 @@ struct brcmf_sdio_card { 
	u32 sbwad;		/* Save backplane window address */

	u32 sbwad;		/* Save backplane window address */

};

};





const uint brcmf_sdio_msglevel = BRCMF_SD_ERROR_VAL;



/* driver info, initialized when brcmf_sdio_register is called */

/* driver info, initialized when brcmf_sdio_register is called */

static struct brcmf_sdioh_driver drvinfo = { NULL, NULL };

static struct brcmf_sdioh_driver drvinfo = { NULL, NULL };
@@ -88,7 +64,7 @@ brcmf_sdcard_attach(void *cfghdl, u32 *regsva) 




	card = kzalloc(sizeof(struct brcmf_sdio_card), GFP_ATOMIC);

	card = kzalloc(sizeof(struct brcmf_sdio_card), GFP_ATOMIC);

	if (card == NULL) {

	if (card == NULL) {

		BRCMF_SD_ERROR(("sdcard_attach: out of memory"));

		BRCMF_ERROR(("sdcard_attach: out of memory"));

		return NULL;

		return NULL;

	}

	}
@@ -167,7 +143,7 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, 
	if (err)

	if (err)

		*err = status;

		*err = status;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",

		     __func__, fnc_num, addr, data));

		     __func__, fnc_num, addr, data));





	return data;

	return data;
@@ -191,7 +167,7 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, 
	if (err)

	if (err)

		*err = status;

		*err = status;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",

		     __func__, fnc_num, addr, data));

		     __func__, fnc_num, addr, data));

}

}
@@ -207,7 +183,7 @@ u32 brcmf_sdcard_cfg_read_word(struct brcmf_sdio_card *card, uint fnc_num, 
	if (err)

	if (err)

		*err = status;

		*err = status;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

		     __func__, fnc_num, addr, data));

		     __func__, fnc_num, addr, data));





	return data;

	return data;
@@ -226,7 +202,7 @@ brcmf_sdcard_cfg_write_word(struct brcmf_sdio_card *card, uint fnc_num, 
	if (err)

	if (err)

		*err = status;

		*err = status;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u32data = 0x%x\n",

		     __func__, fnc_num, addr, data));

		     __func__, fnc_num, addr, data));

}

}
@@ -247,7 +223,7 @@ int brcmf_sdcard_cis_read(struct brcmf_sdio_card *card, uint func, u8 * cis, 
			 into the provided buffer. */

			 into the provided buffer. */

		tmp_buf = kmalloc(length, GFP_ATOMIC);

		tmp_buf = kmalloc(length, GFP_ATOMIC);

		if (tmp_buf == NULL) {

		if (tmp_buf == NULL) {

			BRCMF_SD_ERROR(("%s: out of memory\n", __func__));

			BRCMF_ERROR(("%s: out of memory\n", __func__));

			return -ENOMEM;

			return -ENOMEM;

		}

		}

		memcpy(tmp_buf, cis, length);

		memcpy(tmp_buf, cis, length);
@@ -289,7 +265,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_card *card, u32 addr, uint size) 
	u32 word = 0;

	u32 word = 0;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;





	BRCMF_SD_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr));

	BRCMF_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr));





	if (bar0 != card->sbwad) {

	if (bar0 != card->sbwad) {

		if (brcmf_sdcard_set_sbaddr_window(card, bar0))

		if (brcmf_sdcard_set_sbaddr_window(card, bar0))
@@ -307,7 +283,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_card *card, u32 addr, uint size) 




	card->regfail = (status != 0);

	card->regfail = (status != 0);





	BRCMF_SD_INFO(("u32data = 0x%x\n", word));

	BRCMF_INFO(("u32data = 0x%x\n", word));





	/* if ok, return appropriately masked word */

	/* if ok, return appropriately masked word */

	if (status == 0) {

	if (status == 0) {
@@ -325,7 +301,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_card *card, u32 addr, uint size) 
	}

	}





	/* otherwise, bad sdio access or invalid size */

	/* otherwise, bad sdio access or invalid size */

	BRCMF_SD_ERROR(("%s: error reading addr 0x%04x size %d\n", __func__,

	BRCMF_ERROR(("%s: error reading addr 0x%04x size %d\n", __func__,

		      addr, size));

		      addr, size));

	return 0xFFFFFFFF;

	return 0xFFFFFFFF;

}

}
@@ -337,7 +313,7 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_card *card, u32 addr, uint size, 
	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	int err = 0;

	int err = 0;





	BRCMF_SD_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",

	BRCMF_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",

		     __func__, addr, size * 8, data));

		     __func__, addr, size * 8, data));





	if (bar0 != card->sbwad) {

	if (bar0 != card->sbwad) {
@@ -359,7 +335,7 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_card *card, u32 addr, uint size, 
	if (status == 0)

	if (status == 0)

		return 0;

		return 0;





	BRCMF_SD_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n",

	BRCMF_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n",

		      __func__, data, addr, size));

		      __func__, data, addr, size));

	return 0xFFFFFFFF;

	return 0xFFFFFFFF;

}

}
@@ -383,7 +359,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, 
	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	int err = 0;

	int err = 0;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",

		     __func__, fn, addr, nbytes));

		     __func__, fn, addr, nbytes));





	/* Async not implemented yet */

	/* Async not implemented yet */
@@ -423,7 +399,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, 
	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

	int err = 0;

	int err = 0;





	BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",

	BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",

		     __func__, fn, addr, nbytes));

		     __func__, fn, addr, nbytes));





	/* Async not implemented yet */

	/* Async not implemented yet */

drivers/staging/brcm80211/brcmfmac/sdio_host.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define	_BRCM_SDH_H_

#define	_BRCM_SDH_H_





#include <linux/skbuff.h>

#include <linux/skbuff.h>

extern const uint brcmf_sdio_msglevel;





#define SDIO_FUNC_0		0

#define SDIO_FUNC_0		0

#define SDIO_FUNC_1		1

#define SDIO_FUNC_1		1