mmc: meson-gx: remove useless lock
[ Upstream commit83076d2268
] The spinlock is only used within the irq handler so it does not seem very useful. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Stable-dep-of:3c40eb8145
("mmc: meson-gx: remove redundant mmc_request_done() call from irq context") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ebb623a34d
commit
d7aacfd2e3
@ -26,7 +26,6 @@
|
|||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/spinlock.h>
|
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/mmc/host.h>
|
#include <linux/mmc/host.h>
|
||||||
#include <linux/mmc/mmc.h>
|
#include <linux/mmc/mmc.h>
|
||||||
@ -159,7 +158,6 @@ struct meson_host {
|
|||||||
struct mmc_host *mmc;
|
struct mmc_host *mmc;
|
||||||
struct mmc_command *cmd;
|
struct mmc_command *cmd;
|
||||||
|
|
||||||
spinlock_t lock;
|
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
struct clk *core_clk;
|
struct clk *core_clk;
|
||||||
struct clk *mmc_clk;
|
struct clk *mmc_clk;
|
||||||
@ -1042,8 +1040,6 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)
|
|||||||
if (WARN_ON(!host) || WARN_ON(!host->cmd))
|
if (WARN_ON(!host) || WARN_ON(!host->cmd))
|
||||||
return IRQ_NONE;
|
return IRQ_NONE;
|
||||||
|
|
||||||
spin_lock(&host->lock);
|
|
||||||
|
|
||||||
cmd = host->cmd;
|
cmd = host->cmd;
|
||||||
data = cmd->data;
|
data = cmd->data;
|
||||||
cmd->error = 0;
|
cmd->error = 0;
|
||||||
@ -1093,7 +1089,6 @@ out:
|
|||||||
if (ret == IRQ_HANDLED)
|
if (ret == IRQ_HANDLED)
|
||||||
meson_mmc_request_done(host->mmc, cmd->mrq);
|
meson_mmc_request_done(host->mmc, cmd->mrq);
|
||||||
|
|
||||||
spin_unlock(&host->lock);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1246,8 +1241,6 @@ static int meson_mmc_probe(struct platform_device *pdev)
|
|||||||
host->dev = &pdev->dev;
|
host->dev = &pdev->dev;
|
||||||
dev_set_drvdata(&pdev->dev, host);
|
dev_set_drvdata(&pdev->dev, host);
|
||||||
|
|
||||||
spin_lock_init(&host->lock);
|
|
||||||
|
|
||||||
/* Get regulators and the supported OCR mask */
|
/* Get regulators and the supported OCR mask */
|
||||||
host->vqmmc_enabled = false;
|
host->vqmmc_enabled = false;
|
||||||
ret = mmc_regulator_get_supply(mmc);
|
ret = mmc_regulator_get_supply(mmc);
|
||||||
|
Reference in New Issue
Block a user