From: Nishad Kamdar <nishadkamdar@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Joe Perches" <joe@perches.com>, NeilBrown <neil@brown.name>,
devel@driverdev.osuosl.org,
"Christian Lütke-Stetzkamp" <christian@lkamp.de>,
linux-kernel@vger.kernel.org, "John Crispin" <blogic@openwrt.org>,
"Dan Carpenter" <dan.carpenter@oracle.com>
Subject: [PATCH v6 3/3] staging: mt7621-mmc: Fix debug macro IRQ_MSG and its usages
Date: Sat, 1 Sep 2018 03:51:10 +0530 [thread overview]
Message-ID: <8f8cff3f1042e3fd303350baa261876cf4e3d7e7.1535752537.git.nishadkamdar@gmail.com> (raw)
In-Reply-To: <cover.1535752537.git.nishadkamdar@gmail.com>
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.
Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com>
---
Changes in v6:
- No change
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(-)
diff --git a/drivers/staging/mt7621-mmc/dbg.h b/drivers/staging/mt7621-mmc/dbg.h
index 79914d98c573..4ab9f10dccc2 100644
--- a/drivers/staging/mt7621-mmc/dbg.h
+++ b/drivers/staging/mt7621-mmc/dbg.h
@@ -102,18 +102,6 @@ do { \
} while (0)
#endif /* end of +++ */
-#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 */
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 7474f9ed7b5b..f3ae19fe0f76 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -279,7 +279,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);
@@ -1638,14 +1640,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);
}
@@ -1663,10 +1668,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;
}
@@ -1699,15 +1709,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);
--
2.17.1
next prev parent reply other threads:[~2018-08-31 22:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 22:12 [PATCH v6 0/3] staging: mt7621-mmc: Fix debug macros and their usages Nishad Kamdar
2018-08-31 22:17 ` [PATCH v6 1/3] staging: mt7621-mmc: Delete N_MSG() and all its users Nishad Kamdar
2018-08-31 22:19 ` [PATCH v6 2/3] staging: mt7621-mmc: Fix debug macro ERR_MSG and its usages Nishad Kamdar
2018-08-31 22:21 ` Nishad Kamdar [this message]
2018-09-10 15:05 ` [PATCH v6 3/3] staging: mt7621-mmc: Fix debug macro IRQ_MSG " Greg Kroah-Hartman
2018-09-15 2:29 ` Nishad Kamdar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8f8cff3f1042e3fd303350baa261876cf4e3d7e7.1535752537.git.nishadkamdar@gmail.com \
--to=nishadkamdar@gmail.com \
--cc=blogic@openwrt.org \
--cc=christian@lkamp.de \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=neil@brown.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).