[openwrt/openwrt] ath25: fix compilation for AR2315 MTD driver

LEDE Commits lede-commits at lists.infradead.org
Sun Sep 6 13:58:39 EDT 2020


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3

commit 1a4c1d64bc8c7536cbfc84fd0f11037d09ecd2d3
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Apr 13 19:11:22 2020 +0200

    ath25: fix compilation for AR2315 MTD driver
    
    Kernel commit e7bfb3fdbde3 ("mtd: Stop updating erase_info->state
    and calling mtd_erase_callback()") removed erase_info->state
    updates and calls of mtd_erase_callback().
    
    Drop these erase callback invocations from AR2315 MTD driver as well.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 target/linux/ath25/patches-5.4/120-spiflash.patch | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/target/linux/ath25/patches-5.4/120-spiflash.patch b/target/linux/ath25/patches-5.4/120-spiflash.patch
index d49669b976..52460f89dd 100644
--- a/target/linux/ath25/patches-5.4/120-spiflash.patch
+++ b/target/linux/ath25/patches-5.4/120-spiflash.patch
@@ -23,7 +23,7 @@
  obj-$(CONFIG_MTD_POWERNV_FLASH)	+= powernv_flash.o
 --- /dev/null
 +++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,459 @@
+@@ -0,0 +1,456 @@
 +
 +/*
 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -284,9 +284,6 @@
 +
 +	mutex_unlock(&priv->lock);
 +
-+	instr->state = MTD_ERASE_DONE;
-+	mtd_erase_callback(instr);
-+
 +	return 0;
 +}
 +



More information about the lede-commits mailing list