Fix debug macros and their usages
Subsystems (2)
v4 cover Fix debug macros and their usages
This patchset fixes the four debug macros N_MSG, ERR_MSG, INIT_MSG and IRQ_MSG. Each patch fixes one particular macro and its usages.
For N_MSG, replaces printk with dev_<level> without __func__ or __LINE__ or current->comm and current->pid. Removes the do {} while(0) loop for the single statement macro.
For ERR_MSG and IRQ_MSG, makes the same changes as those for N_MSG, but further drops the macros and replaces their usages with dev_<level>.
Removes the INIT_MSG macro and its usages.
Changes in v4:
- Create multiple patches, one for each type of macro being deleted/changed.
Changes in v3:
- Replace usages of ERR_MSG and IRQ_MSG with dev_err() in code itself.
- Remove all INIT_MSG usages.
- Drop ERR_MSG, INIT_MSG and IRQ_MSG from dbg.h.
Changes in v2:
- Replace printk with dev_<level>.
- Remove __func__, __LINE__, current->comm, current->pid from arguments.
- Remove the do {} while(0) loop from these macros.
- Modify commit message to include other changes.
-
Nishad Kamdar (4):
staging: mt7621-mmc: Fix debug macro N_MSG
staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages
staging: mt7621-mmc: Remove macro INIT_MSG and its usages
staging: mt7621-mmc: Fix debug macro IRQ_MSG and its usages
drivers/staging/mt7621-mmc/dbg.h | 36 +------ drivers/staging/mt7621-mmc/sd.c | 180 ++++++++++++++++++++----------- 2 files changed, 121 insertions(+), 95 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/4 staging: mt7621-mmc: Fix debug macro N_MSG
This patch fixes the debug macro N_MSG. Replaces printk with dev_<level> without __func__ or __LINE__ or current->comm and current->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.
--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +4 -7
@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ -if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ #define ERR_MSG(fmt, args...) \ do { \
Signature · 1 line
2.17.1
Re: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \
drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/
I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
To me the original code seems fine.
regards,
dan carpenter
Re: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
Quoted 35 lines · Dan Carpenter
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
Quoted 5 lines
To me the original code seems fine.
regards,
dan carpenter
Ok. But the macro definition was already commented. I just changed printk to dev_err and gave it a better block comment format.
Should I leave the older version as it is ?
Thanks for the review.
regards,
nishad
Greg Kroah-Hartman
maintainerRe: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
Quoted 38 lines · Nishad Kamdar
Quoted 37 lines · Dan Carpenter
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
To me the original code seems fine.
Quoted 8 lines
Quoted 3 lines
regards,
dan carpenterOk. But the macro definition was already commented. I just changed printk to
dev_errand gave it a better block comment format.
Should I leave the older version as it is ?
No, delete the whole thing if it is not being used, don't "convert" code that is commented out.
thanks,
greg k-h
Re: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
Quoted 48 lines · Greg Kroah-Hartman
Quoted 38 lines · Nishad Kamdar
Quoted 37 lines · Dan Carpenter
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
To me the original code seems fine.
Quoted 8 lines
Quoted 3 lines
regards,
dan carpenterOk. But the macro definition was already commented. I just changed printk to
dev_errand gave it a better block comment format.
Should I leave the older version as it is ?
Quoted 6 lines
No, delete the whole thing if it is not being used, don't "convert" code that is commented out.
thanks,
greg k-h
Ok, I'll do that.
Thanks for the review.
regards,
nishad
Re: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
In reply to Nishad KamdarQuoted 38 lines · Nishad Kamdar
Quoted 37 lines · Dan Carpenter
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
To me the original code seems fine.
Quoted 8 lines
Quoted 3 lines
regards,
dan carpenterOk. But the macro definition was already commented. I just changed printk to
dev_errand gave it a better block comment format.
Should I leave the older version as it is ?
Oh... Yeah. You're right. Sorry about that.
We normally just delete dead code without even thinking hard about it. It turns out that if we delete all the N_MSG() code, it's actually quite a bit. But probably it's the right thing to do, instead of hanging on to it like a hoarder.
regards,
dan carpenter
Re: [PATCH v4 1/4] staging: mt7621-mmc: Fix debug macro N_MSG
Quoted 50 lines · Dan Carpenter
Quoted 38 lines · Nishad Kamdar
Quoted 37 lines · Dan Carpenter
Quoted 19 lines · Nishad Kamdar
This patch fixes the debug macro
N_MSG. Replaces printk with dev_<level> without__func__or__LINE__orcurrent->commandcurrent->pid. Removes the do {} while(0) loop for the single statement macro. Issue found by checkpatch.Signed-off-by Nishad Kamdar <[email protected]>--- drivers/staging/mt7621-mmc/dbg.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)drivers/staging/mt7621-mmc/dbg.h +0
-1@@ -104,13 +104,10 @@ do { \ #define N_MSG(evt, fmt, args...)/* -do { \ drivers/staging/mt7621-mmc/dbg.h do { \ · line 110
Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +4
-6-if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ -printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ -host->id, ##args , __FUNCTION__, __LINE__, current->comm, current->pid); \ -} \ -} while(0) -*/ +*if ((DBG_EVT_##evt) & sd_debug_zone[host->id]) { \ +* dev_err(mmc_dev(host->mmc), "%d -> " fmt "\n", host->id, ##args) \ +*} +*/ I don't understand what you're trying to do here. You just commented out the macro and turned it into a no-op. That's not what the patch description says.
To me the original code seems fine.
Quoted 8 lines
Quoted 3 lines
regards,
dan carpenterOk. But the macro definition was already commented. I just changed printk to
dev_errand gave it a better block comment format.
Should I leave the older version as it is ?Oh... Yeah. You're right. Sorry about that.
Quoted 8 lines
We normally just delete dead code without even thinking hard about it. It turns out that if we delete all the
N_MSG()code, it's actually quite a bit. But probably it's the right thing to do, instead of hanging on to it like a hoarder.regards,
dan carpenter
Ok. I get it.
Thanks for the review.
regards,
nishad
PATCH v4 2/4 staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages
In reply to Nishad KamdarReplace all usages of ERR_MSG with with dev_<level> without __func__ or __LINE__ or current->comm and current->pid. Remove the do {} while(0) loop for the single statement macro. Drop ERR_MSG from dbg.h. Issue found by checkpatch.
--- drivers/staging/mt7621-mmc/dbg.h | 6 -- drivers/staging/mt7621-mmc/sd.c | 128 ++++++++++++++++++++++--------- 2 files changed, 90 insertions(+), 44 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -6
@@ -109,12 +109,6 @@ do { \*} */ -#define ERR_MSG(fmt, args...) \ -do { \ - printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \ -} while (0); -#if 1 //defined CONFIG_MTK_MMC_CD_POLL #define INIT_MSG(fmt, args...)
drivers/staging/mt7621-mmc/sd.c +90 -38
260 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 2/4] staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 470
Quoted 11 lines · Nishad Kamdar
drivers/staging/mt7621-mmc/sd.c +2
-1@@ -466,7 +466,8 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz)//u8 clksrc = hw->clk_src; if (!hz) {// set mmc system clock to 0 ? -//ERR_MSG("set mclk to 0!!!"); +//dev_err(mmc_dev(host->mmc), "%d -> set mclk to 0!!!\n", +// host->id);
Just delete commented out code.
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 473
Quoted 3 lines
drivers/staging/mt7621-mmc/sd.c +0
-0msdc_reset_hw (host);return ; }
regards,
dan carpenter
Re: [PATCH v4 2/4] staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages
Quoted 15 lines · Dan Carpenter
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 470
Quoted 11 lines · Nishad Kamdar
drivers/staging/mt7621-mmc/sd.c +2
-1@@ -466,7 +466,8 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz)//u8 clksrc = hw->clk_src; if (!hz) {// set mmc system clock to 0 ? -//ERR_MSG("set mclk to 0!!!"); +//dev_err(mmc_dev(host->mmc), "%d -> set mclk to 0!!!\n", +// host->id); Just delete commented out code.
Quoted 7 lines
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 473
Quoted 3 lines
drivers/staging/mt7621-mmc/sd.c +0
-0msdc_reset_hw (host);return ; }regards,
dan carpenter
Ok, I'll do that.
Thanks for the review.
regards,
nishad
Re: [PATCH v4 2/4] staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages
In reply to Dan CarpenterQuoted 15 lines · Dan Carpenter
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 470
Quoted 11 lines · Nishad Kamdar
drivers/staging/mt7621-mmc/sd.c +2
-1@@ -466,7 +466,8 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz)//u8 clksrc = hw->clk_src; if (!hz) {// set mmc system clock to 0 ? -//ERR_MSG("set mclk to 0!!!"); +//dev_err(mmc_dev(host->mmc), "%d -> set mclk to 0!!!\n", +// host->id); Just delete commented out code.
Quoted 7 lines
drivers/staging/mt7621-mmc/sd.c static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) · line 473
Quoted 3 lines
drivers/staging/mt7621-mmc/sd.c +0
-0msdc_reset_hw (host);return ; }regards,
dan carpenter
Ok, I'll do that.
Thanks for the review.
regards,
nishad
PATCH v4 3/4 staging: mt7621-mmc: Remove macro INIT_MSG and its usages
In reply to Nishad KamdarRemoved all usages of INIT_MSG and dropped it from dbg.h.
--- drivers/staging/mt7621-mmc/dbg.h | 7 ------- drivers/staging/mt7621-mmc/sd.c | 16 ---------------- 2 files changed, 23 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -7
@@ -111,15 +111,8 @@ do { \#if 1 //defined CONFIG_MTK_MMC_CD_POLL -#define INIT_MSG(fmt, args...) #define IRQ_MSG(fmt, args...)#else -#define INIT_MSG(fmt, args...) \ -do { \ - printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d> PID<%s><0x%x>\n", \ - host->id, ##args, __FUNCTION__, __LINE__, current->comm, current->pid); \ -} while (0); -/* PID in ISR in not corrent */ #define IRQ_MSG(fmt, args...) \ do { \
drivers/staging/mt7621-mmc/sd.c +0 -16
@@ -187,12 +187,10 @@ static u32 hclks[] = {50000000}; /* +/- by chhung *///============================================ #define msdc_vcore_on (host) \ do { \ - INIT_MSG("[+]VMC ref. count<%d>", ++host->pwr_ref); \ (void)hwPowerOn(MT65XX_POWER_LDO_VMC, VOL_3300, "SD"); \ } while (0)#define msdc_vcore_off (host) \ do { \ - INIT_MSG("[-]VMC ref. count<%d>", --host->pwr_ref); \ (void)hwPowerDown(MT65XX_POWER_LDO_VMC, "SD"); \ } while (0)
@@ -439,7 +437,6 @@ static void msdc_select_clksrc(struct msdc_host *host, unsigned char clksrc)u32 val;BUG_ON (clksrc >3 ); -INIT_MSG ("set clock source to <%d>" , clksrc); val =readl (host->base +MSDC_CLKSRC_REG );if (readl (host->base +MSDC_ECO_VER ) >=4 ) {
@@ -510,10 +507,6 @@ static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) host->mclk = hz;msdc_set_timeout (host, host->timeout_ns, host->timeout_clks);// need? -INIT_MSG ("================" ); -INIT_MSG ("!!! Set<%dKHz> Source<%dKHz> -> sclk<%dKHz>" , hz /1000 , hclk /1000 , sclk /1000 ); -INIT_MSG ("================" ); -msdc_irq_restore (flags); }
@@ -671,12 +664,6 @@ static void msdc_pm(pm_message_t state, void *data)struct msdc_host *host = (struct msdc_host *)data;int evt = state.event; -if (evt ==PM_EVENT_USER_RESUME || evt ==PM_EVENT_USER_SUSPEND ) { -INIT_MSG ("USR_%s: suspend<%d> power<%d>" , - evt ==PM_EVENT_USER_RESUME ?"EVENT_USER_RESUME" :"EVENT_USER_SUSPEND" , - host->suspend, host->power_mode); - } -if (evt ==PM_EVENT_SUSPEND || evt ==PM_EVENT_USER_SUSPEND ) {if (host->suspend)/* already suspend */ /* default 0*/ return ;
@@ -1762,7 +1749,6 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)if (host->mclk != ios->clock) {if (ios->clock >25000000 ) {//if (!(host->hw->flags & MSDC_REMOVABLE)) { -INIT_MSG ("SD data latch edge<%d>" ,MSDC_SMPL_FALLING );sdr_set_field (host->base +MSDC_IOCON ,MSDC_IOCON_RSPL ,MSDC_SMPL_FALLING ); sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DSPL,
@@ -1815,7 +1801,6 @@ static int msdc_ops_get_cd(struct mmc_host *mmc)return 1 ;#else host->card_inserted = (host->pm_state.event ==PM_EVENT_USER_RESUME ) ?1 :0 ; -INIT_MSG ("sdio ops_get_cd<%d>" , host->card_inserted);return host->card_inserted;#endif }
@@ -1839,7 +1824,6 @@ static int msdc_ops_get_cd(struct mmc_host *mmc) present =0 ;/* TODO? Check DAT3 pins for card detection */ } -INIT_MSG ("ops_get_cd return<%d>" , present);return present; }
Signature · 1 line
2.17.1
PATCH v4 4/4 staging: mt7621-mmc: Fix debug macro IRQ_MSG and its usages
In reply to Nishad KamdarReplace all usages of IRQ_MSG with with dev_<level> without __func__ or __LINE__ or current->comm and current->pid. Remove the do {} while(0) loop for the single statement macro. Drop IRQ_MSG from dbg.h. Issue found by checkpatch.
--- drivers/staging/mt7621-mmc/dbg.h | 12 ----------- drivers/staging/mt7621-mmc/sd.c | 36 ++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 21 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -12
@@ -109,18 +109,6 @@ do { \*} */ -#if 1 -//defined CONFIG_MTK_MMC_CD_POLL -#define IRQ_MSG(fmt, args...) -#else -/* PID in ISR in not corrent */ -#define IRQ_MSG(fmt, args...) \ -do { \ - printk(KERN_ERR TAG"%d -> "fmt" <- %s() : L<%d>\n", \ - host->id, ##args, __FUNCTION__, __LINE__); \ -} while (0); -#endif -void msdc_debug_proc_init (void );#if 0 /* --- chhung */
drivers/staging/mt7621-mmc/sd.c +27 -9
@@ -420,7 +420,9 @@ static void msdc_tasklet_card(struct work_struct *work)mmc_detect_change (host->mmc,msecs_to_jiffies (20 )); } -IRQ_MSG ("card found<%s>" , inserted ?"inserted" :"removed" ); +dev_err (mmc_dev (host->mmc), +"%d -> card found<%s>\n" , + host->id, inserted ?"inserted" :"removed" );#endif spin_unlock (&host->lock);
@@ -1858,14 +1860,17 @@ static irqreturn_t msdc_irq(int irq, void *dev_id)if (intsts &MSDC_INT_CDSC ) {if (host->mmc->caps &MMC_CAP_NEEDS_POLL )return IRQ_HANDLED ; -IRQ_MSG ("MSDC_INT_CDSC irq<0x%.8x>" , intsts); +dev_err (mmc_dev (host->mmc), +"%d -> MSDC_INT_CDSC irq<0x%.8x>\n" , host->id, intsts);schedule_delayed_work (&host->card_delaywork,HZ );/* tuning when plug card ? */ }/* sdio interrupt */ if (intsts &MSDC_INT_SDIOIRQ ) { -IRQ_MSG ("XXX MSDC_INT_SDIOIRQ" );/* seems not sdio irq */ +dev_err (mmc_dev (host->mmc), +"%d -> XXX MSDC_INT_SDIOIRQ\n" , + host->id);/* seems not sdio irq */ //mmc_signal_sdio_irq(host->mmc); }
@@ -1883,10 +1888,15 @@ static irqreturn_t msdc_irq(int irq, void *dev_id)msdc_clr_int ();if (intsts &MSDC_INT_DATTMO ) { -IRQ_MSG ("XXX CMD<%d> MSDC_INT_DATTMO" , host->mrq->cmd->opcode); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_DATTMO\n" , + host->id, host->mrq->cmd->opcode); data->error = -ETIMEDOUT ; }else if (intsts &MSDC_INT_DATCRCERR ) { -IRQ_MSG ("XXX CMD<%d> MSDC_INT_DATCRCERR, SDC_DCRC_STS<0x%x>" , host->mrq->cmd->opcode,readl (host->base +SDC_DCRC_STS )); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_DATCRCERR, SDC_DCRC_STS<0x%x>\n" , + host->id, host->mrq->cmd->opcode, + readl(host->base + SDC_DCRC_STS); data->error = -EIO ; }
@@ -1919,15 +1929,23 @@ static irqreturn_t msdc_irq(int irq, void *dev_id) } }else if ((intsts &MSDC_INT_RSPCRCERR ) || (intsts &MSDC_INT_ACMDCRCERR )) {if (intsts &MSDC_INT_ACMDCRCERR ) -IRQ_MSG ("XXX CMD<%d> MSDC_INT_ACMDCRCERR" , cmd->opcode); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_ACMDCRCERR\n" , + host->id, cmd->opcode);else -IRQ_MSG ("XXX CMD<%d> MSDC_INT_RSPCRCERR" , cmd->opcode); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_RSPCRCERR\n" , + host->id, cmd->opcode); cmd->error = -EIO ; }else if ((intsts &MSDC_INT_CMDTMO ) || (intsts &MSDC_INT_ACMDTMO )) {if (intsts &MSDC_INT_ACMDTMO ) -IRQ_MSG ("XXX CMD<%d> MSDC_INT_ACMDTMO" , cmd->opcode); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_ACMDTMO\n" , + host->id, cmd->opcode);else -IRQ_MSG ("XXX CMD<%d> MSDC_INT_CMDTMO" , cmd->opcode); +dev_err (mmc_dev (host->mmc), +"%d -> XXX CMD<%d> MSDC_INT_CMDTMO\n" , + host->id, cmd->opcode); cmd->error = -ETIMEDOUT ;msdc_reset_hw (host);msdc_clr_fifo (host);
Signature · 1 line
2.17.1