[openwrt/openwrt] ramips: remove broken and bogus spinlock in the SPI driver

LEDE Commits lede-commits at lists.infradead.org
Sat Apr 14 11:13:12 PDT 2018


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/31a6ee021948a88b9b1e484b412be21f7169184e

commit 31a6ee021948a88b9b1e484b412be21f7169184e
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Apr 14 19:52:36 2018 +0200

    ramips: remove broken and bogus spinlock in the SPI driver
    
    Based on patch by Neil Brown
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch b/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
index 5f939e3..c615601 100644
--- a/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
+++ b/target/linux/ramips/patches-4.14/0043-spi-add-mt7621-support.patch
@@ -38,7 +38,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
  obj-$(CONFIG_SPI_OC_TINY)		+= spi-oc-tiny.o
 --- /dev/null
 +++ b/drivers/spi/spi-mt7621.c
-@@ -0,0 +1,491 @@
+@@ -0,0 +1,488 @@
 +/*
 + * spi-mt7621.c -- MediaTek MT7621 SPI controller driver
 + *
@@ -106,7 +106,6 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	unsigned int		sys_freq;
 +	unsigned int		speed;
 +	struct clk		*clk;
-+	spinlock_t		lock;
 +
 +	struct mt7621_spi_ops	*ops;
 +};
@@ -438,7 +437,6 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	const struct of_device_id *match;
 +	struct spi_master *master;
 +	struct mt7621_spi *rs;
-+	unsigned long flags;
 +	void __iomem *base;
 +	struct resource *r;
 +	int status = 0;
@@ -490,7 +488,6 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	rs->sys_freq = clk_get_rate(rs->clk);
 +	rs->ops = ops;
 +	dev_info(&pdev->dev, "sys_freq: %u\n", rs->sys_freq);
-+	spin_lock_irqsave(&rs->lock, flags);
 +
 +	device_reset(&pdev->dev);
 +



More information about the lede-commits mailing list