From: Jorgyano Vieira Date: Fri, 17 Feb 2012 23:38:09 +0000 (-0200) Subject: Staging: crystalhd: Get rid of unecessary BCMLOG_ENTER macro X-Git-Tag: MMI-PSA29.97-13-9~17268^2~136 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eb6cfa5b74ae362f17a2ce43fe2caab3c98b4e70;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: crystalhd: Get rid of unecessary BCMLOG_ENTER macro The BCMLOG_ENTER macro is used only in five functions, perhaps it is remainder of debugging some specific problem, now, this macro don't seems to be useful, so it should be removed. Signed-off-by: Jorgyano Vieira Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c index eeddee9a6050..2d02ed2c77af 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.c +++ b/drivers/staging/crystalhd/crystalhd_hw.c @@ -1627,7 +1627,6 @@ enum BC_STATUS crystalhd_download_fw(struct crystalhd_adp *adp, void *buffer, ui uint32_t fw_sig_len = 36; uint32_t dram_offset = BC_FWIMG_ST_ADDR, sig_reg; - BCMLOG_ENTER; if (!adp || !buffer || !sz) { BCMLOG_ERR("Invalid Params.\n"); @@ -1724,8 +1723,6 @@ enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw, crystalhd_create_event(&fw_cmd_event); - BCMLOG_ENTER; - if (!hw || !fw_cmd) { BCMLOG_ERR("Invalid Arguments\n"); return BC_STS_INV_ARG; diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 7e0c199f6893..9dca92c95577 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -298,7 +298,6 @@ static int chd_dec_open(struct inode *in, struct file *fd) enum BC_STATUS sts = BC_STS_SUCCESS; struct crystalhd_user *uc = NULL; - BCMLOG_ENTER; if (!adp) { BCMLOG_ERR("Invalid adp\n"); return -EINVAL; @@ -327,7 +326,6 @@ static int chd_dec_close(struct inode *in, struct file *fd) struct crystalhd_adp *adp = chd_get_adp(); struct crystalhd_user *uc; - BCMLOG_ENTER; if (!adp) { BCMLOG_ERR("Invalid adp\n"); return -EINVAL; @@ -513,8 +511,6 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev) struct crystalhd_adp *pinfo; enum BC_STATUS sts = BC_STS_SUCCESS; - BCMLOG_ENTER; - pinfo = pci_get_drvdata(pdev); if (!pinfo) { BCMLOG_ERR("could not get adp\n"); diff --git a/drivers/staging/crystalhd/crystalhd_misc.h b/drivers/staging/crystalhd/crystalhd_misc.h index eedd9b70465c..d2f7256146e4 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.h +++ b/drivers/staging/crystalhd/crystalhd_misc.h @@ -200,15 +200,8 @@ enum _chd_log_levels { BCMLOG_INFO = 0x00000001, /* Generic informational */ BCMLOG_DBG = 0x00000002, /* First level Debug info */ BCMLOG_SSTEP = 0x00000004, /* Stepping information */ - BCMLOG_ENTER_LEAVE = 0x00000008, /* stack tracking */ }; -#define BCMLOG_ENTER \ -do { \ - if (g_linklog_level & BCMLOG_ENTER_LEAVE) \ - printk(KERN_DEBUG "Entered %s\n", __func__); \ -} while (0) - #define BCMLOG(trace, fmt, args...) \ do { \