Skip to contentSkip to conversation

staging: mt7621-mmc: Fix debug macros and their usages

PATCH Superseded Nishad Kamdar 2 participants 7 messages Aug 23, 2018 – Aug 29, 2018

Subsystems (2)

v5 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

v5 cover staging: mt7621-mmc: Fix debug macros and their usages

The 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, removes the commented code in dbg.h.

For ERR_MSG and IRQ_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. Further drops the macros and replaces their usages with dev_<level>. Deletes the commented usages.

Removes the INIT_MSG macro and its usages.

Changes in v5:
- Remove commented code for N_MSG().
- Remove commented ERR_MSG() 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: Remove commented code for 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 |  33 ------
 drivers/staging/mt7621-mmc/sd.c  | 172 +++++++++++++++++++------------
 2 files changed, 108 insertions(+), 97 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v5 1/4 staging: mt7621-mmc: Remove commented code for N_MSG

This patch removes the dead code for N_MSG().

---
Changes in v5:
- Remove commented code for N_MSG()

---
 drivers/staging/mt7621-mmc/dbg.h | 8 --------
 1 file changed, 8 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -8
index 2f2c56b73987..6f6b4505337f 100644
@@ -103,14 +103,6 @@ do { \
 #endif /* end of +++ */
 
 #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)
-*/
 
 #define ERR_MSG(fmt, args...) \
 do { \
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH v5 1/4] staging: mt7621-mmc: Remove commented code for N_MSG

Quoted 17 lines · Nishad Kamdar

This patch removes the dead code for N_MSG().

---
Changes in v5:
- Remove commented code for N_MSG()

---
 drivers/staging/mt7621-mmc/dbg.h | 8 --------
 1 file changed, 8 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -0
index 2f2c56b73987..6f6b4505337f 100644
@@ -103,14 +103,6 @@ do { \
 #endif /* end of +++ */
 

drivers/staging/mt7621-mmc/dbg.h do { \ · line 106

Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +0 -8
 #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)
-*/
 

So what are we supposed to do with a macro that defines nothing now? Please delete it and all users of it at the same time.

thanks,

greg k-h

#3 lore raw

Re: [PATCH v5 1/4] staging: mt7621-mmc: Remove commented code for N_MSG

Quoted 32 lines · Greg Kroah-Hartman
Quoted 17 lines · Nishad Kamdar

This patch removes the dead code for N_MSG().

---
Changes in v5:
- Remove commented code for N_MSG()

---
 drivers/staging/mt7621-mmc/dbg.h | 8 --------
 1 file changed, 8 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -0
index 2f2c56b73987..6f6b4505337f 100644
@@ -103,14 +103,6 @@ do { \
 #endif /* end of +++ */
 

drivers/staging/mt7621-mmc/dbg.h do { \ · line 106

Quoted 10 lines
drivers/staging/mt7621-mmc/dbg.h +0 -8
 #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)
-*/
 

So what are we supposed to do with a macro that defines nothing now? Please delete it and all users of it at the same time.

Quoted 3 lines

thanks,

greg k-h

Ok, I'll do that.

thanks for the review.

regards,
nishad

#4 lore raw

PATCH v5 2/4 staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages

In reply to Nishad Kamdar

Replace 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. Delete commented ERR_MSG() usage. Drop ERR_MSG from dbg.h. Issue found by checkpatch.

---
Changes in v5:
- Remove commented ERR_MSG() usage.

---
 drivers/staging/mt7621-mmc/dbg.h |   6 --
 drivers/staging/mt7621-mmc/sd.c  | 120 +++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 45 deletions(-)
drivers/staging/mt7621-mmc/dbg.h +0 -6
index 6f6b4505337f..28c0cf76664f 100644
@@ -104,12 +104,6 @@ do { \
 
 #define N_MSG(evt, fmt, args...)
 
-#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 +81 -39

252 lines not on this page · raw message

Signature · 1 line
2.17.1
#5 lore raw

PATCH v5 3/4 staging: mt7621-mmc: Remove macro INIT_MSG and its usages

In reply to Nishad Kamdar

Removed all usages of INIT_MSG and dropped it from dbg.h.

---
Changes in v5:
- No change

---
 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
index 28c0cf76664f..a5fdafe80d3d 100644
@@ -106,15 +106,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
index dcd036914467..fd02bf819c6c 100644
@@ -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) {
@@ -508,10 +505,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);
 }
 
@@ -669,12 +662,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;
@@ -1752,7 +1739,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,
@@ -1805,7 +1791,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
 	}
@@ -1829,7 +1814,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
#6 lore raw

PATCH v5 4/4 staging: mt7621-mmc: Fix debug macro IRQ_MSG and its usages

In reply to Nishad Kamdar

Replace 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.

---
Changes in v5:
- No change

---
 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
index a5fdafe80d3d..256979424309 100644
@@ -104,18 +104,6 @@ do { \
 
 #define N_MSG(evt, fmt, args...)
 
-#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
index fd02bf819c6c..e5bd3273cc04 100644
@@ -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);
@@ -1848,14 +1850,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);
 	}
 
@@ -1873,10 +1878,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;
 			}
 
@@ -1909,15 +1919,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