Re: [PATCH v7 1/1] staging: mt7621-mmc: Delete IRQ_MSG() and its users.
From: Greg Kroah-Hartman
Date: Tue Sep 18 2018 - 07:29:08 EST
On Sat, Sep 15, 2018 at 08:28:03AM +0530, Nishad Kamdar wrote:
> This patch removes IRQ_MSG() and its users as currently it is a no-op.
>
> Signed-off-by: Nishad Kamdar <nishadkamdar@xxxxxxxxx>
> ---
> Changes in v7:
> - Delete IRQ_MSG() and all its users
> Changes in v6:
> - No change
> Changes in v5:
> - No change
> ---
> drivers/staging/mt7621-mmc/dbg.h | 12 ------------
> drivers/staging/mt7621-mmc/sd.c | 19 -------------------
> 2 files changed, 31 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..273593427d3a 100644
> --- a/drivers/staging/mt7621-mmc/sd.c
> +++ b/drivers/staging/mt7621-mmc/sd.c
> @@ -278,8 +278,6 @@ static void msdc_tasklet_card(struct work_struct *work)
> host->mmc->f_max = HOST_MAX_MCLK;
> mmc_detect_change(host->mmc, msecs_to_jiffies(20));
> }
> -
> - IRQ_MSG("card found<%s>", inserted ? "inserted" : "removed");
> #endif
>
> spin_unlock(&host->lock);
> @@ -1638,17 +1636,10 @@ 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);
> 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 */
> - //mmc_signal_sdio_irq(host->mmc);
> - }
> -
> /* transfer complete interrupt */
> if (data != NULL) {
> if (inten & MSDC_INT_XFER_COMPL) {
> @@ -1663,10 +1654,8 @@ 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);
> 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));
> data->error = -EIO;
> }
The {} should be removed here, right?
thanks,
greg k-h