ath25: fix compilation for AR2315 MTD driver
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Mon, 13 Apr 2020 17:11:22 +0000 (19:11 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Sun, 6 Sep 2020 17:49:28 +0000 (19:49 +0200)
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@adrianschmutzler.de>
target/linux/ath25/patches-5.4/120-spiflash.patch

index d49669b976b3bf461bcd18603691b739d9bcc2d6..52460f89dda9d4682de6413c749cefe74e8fbbf4 100644 (file)
@@ -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
 +
 +      mutex_unlock(&priv->lock);
 +
-+      instr->state = MTD_ERASE_DONE;
-+      mtd_erase_callback(instr);
-+
 +      return 0;
 +}
 +