| Message ID | 1604375323-33556-1-git-send-email-tiantao6@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: meson-mx-sdio: replace spin_lock_irqsave by spin_lock in hard IRQ | expand |
On Tue 03 Nov 2020 at 04:48, Tian Tao <tiantao6@hisilicon.com> wrote: > The code has been in a irq-disabled context since it is hard IRQ. There > is no necessity to do it again. > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> > --- > drivers/mmc/host/meson-mx-sdio.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c > index 1c5299c..d4a4891 100644 > --- a/drivers/mmc/host/meson-mx-sdio.c > +++ b/drivers/mmc/host/meson-mx-sdio.c > @@ -418,10 +418,9 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) > { > struct meson_mx_mmc_host *host = (void *) data; > u32 irqs, send; > - unsigned long irqflags; > irqreturn_t ret; > > - spin_lock_irqsave(&host->irq_lock, irqflags); > + spin_lock(&host->irq_lock); > > irqs = readl(host->base + MESON_MX_SDIO_IRQS); > send = readl(host->base + MESON_MX_SDIO_SEND); > @@ -434,7 +433,7 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) > /* finally ACK all pending interrupts */ > writel(irqs, host->base + MESON_MX_SDIO_IRQS); > > - spin_unlock_irqrestore(&host->irq_lock, irqflags); > + spin_unlock(&host->irq_lock); > > return ret; > }
On Tue, 3 Nov 2020 at 04:48, Tian Tao <tiantao6@hisilicon.com> wrote: > > The code has been in a irq-disabled context since it is hard IRQ. There > is no necessity to do it again. > > Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/meson-mx-sdio.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c > index 1c5299c..d4a4891 100644 > --- a/drivers/mmc/host/meson-mx-sdio.c > +++ b/drivers/mmc/host/meson-mx-sdio.c > @@ -418,10 +418,9 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) > { > struct meson_mx_mmc_host *host = (void *) data; > u32 irqs, send; > - unsigned long irqflags; > irqreturn_t ret; > > - spin_lock_irqsave(&host->irq_lock, irqflags); > + spin_lock(&host->irq_lock); > > irqs = readl(host->base + MESON_MX_SDIO_IRQS); > send = readl(host->base + MESON_MX_SDIO_SEND); > @@ -434,7 +433,7 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) > /* finally ACK all pending interrupts */ > writel(irqs, host->base + MESON_MX_SDIO_IRQS); > > - spin_unlock_irqrestore(&host->irq_lock, irqflags); > + spin_unlock(&host->irq_lock); > > return ret; > } > -- > 2.7.4 >
diff --git a/drivers/mmc/host/meson-mx-sdio.c b/drivers/mmc/host/meson-mx-sdio.c index 1c5299c..d4a4891 100644 --- a/drivers/mmc/host/meson-mx-sdio.c +++ b/drivers/mmc/host/meson-mx-sdio.c @@ -418,10 +418,9 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) { struct meson_mx_mmc_host *host = (void *) data; u32 irqs, send; - unsigned long irqflags; irqreturn_t ret; - spin_lock_irqsave(&host->irq_lock, irqflags); + spin_lock(&host->irq_lock); irqs = readl(host->base + MESON_MX_SDIO_IRQS); send = readl(host->base + MESON_MX_SDIO_SEND); @@ -434,7 +433,7 @@ static irqreturn_t meson_mx_mmc_irq(int irq, void *data) /* finally ACK all pending interrupts */ writel(irqs, host->base + MESON_MX_SDIO_IRQS); - spin_unlock_irqrestore(&host->irq_lock, irqflags); + spin_unlock(&host->irq_lock); return ret; }
The code has been in a irq-disabled context since it is hard IRQ. There is no necessity to do it again. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> --- drivers/mmc/host/meson-mx-sdio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)