]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mmc: owl-mmc: replace spin_lock_irqsave by spin_lock in hard IRQ
authorTian Tao <tiantao6@hisilicon.com>
Mon, 2 Nov 2020 00:52:17 +0000 (08:52 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 16 Nov 2020 10:59:29 +0000 (11:59 +0100)
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: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/1604278337-55624-1-git-send-email-tiantao6@hisilicon.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/owl-mmc.c

index ccf214a89eda9213b0ab9293db330678ccdb1aa4..82d2bad577ca83b1a9102f41b98cf5bc1ac553ed 100644 (file)
@@ -134,10 +134,9 @@ static void owl_mmc_update_reg(void __iomem *reg, unsigned int val, bool state)
 static irqreturn_t owl_irq_handler(int irq, void *devid)
 {
        struct owl_mmc_host *owl_host = devid;
-       unsigned long flags;
        u32 state;
 
-       spin_lock_irqsave(&owl_host->lock, flags);
+       spin_lock(&owl_host->lock);
 
        state = readl(owl_host->base + OWL_REG_SD_STATE);
        if (state & OWL_SD_STATE_TEI) {
@@ -147,7 +146,7 @@ static irqreturn_t owl_irq_handler(int irq, void *devid)
                complete(&owl_host->sdc_complete);
        }
 
-       spin_unlock_irqrestore(&owl_host->lock, flags);
+       spin_unlock(&owl_host->lock);
 
        return IRQ_HANDLED;
 }