diff options
author | David Bauer <mail@david-bauer.net> | 2021-12-21 22:00:06 +0100 |
---|---|---|
committer | David Bauer <mail@david-bauer.net> | 2021-12-29 03:44:56 +0100 |
commit | 79a81d36ae60026624379a8d24ae3719ee2d149c (patch) | |
tree | 81f6095f26bb87765383749633a566bf7c027537 /target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c | |
parent | 00b194871cd82dfbaf678626e49816ab3a51ece8 (diff) | |
download | upstream-79a81d36ae60026624379a8d24ae3719ee2d149c.tar.gz upstream-79a81d36ae60026624379a8d24ae3719ee2d149c.tar.bz2 upstream-79a81d36ae60026624379a8d24ae3719ee2d149c.zip |
ath79: remove pre-5.10 specific kernel code
With Kernel 5.4 support removed, we can get rid of this legacy code.
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c')
-rw-r--r-- | target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c index e040726f44..fafb3f56b8 100644 --- a/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c +++ b/target/linux/ath79/files/drivers/mtd/nand/raw/ar934x_nand.c @@ -14,9 +14,7 @@ #include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/mtd/mtd.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) #include <linux/mtd/nand.h> -#endif #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> #include <linux/platform_device.h> @@ -722,11 +720,7 @@ static void ar934x_nfc_cmdfunc(struct nand_chip *nand, unsigned int command, break; case NAND_CMD_PAGEPROG: -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) if (nand->ecc.engine_type == NAND_ECC_ENGINE_TYPE_ON_HOST) { -#else - if (nand->ecc.mode == NAND_ECC_HW) { -#endif /* the data is already written */ break; } @@ -1334,29 +1328,15 @@ static int ar934x_nfc_attach_chip(struct nand_chip *nand) if (mtd->writesize == 2048) nand->options |= NAND_NO_SUBPAGE_WRITE; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) if (nand->ecc.engine_type == NAND_ECC_ENGINE_TYPE_ON_HOST) { -#else - if (nand->ecc.mode == NAND_ECC_HW) { -#endif ret = ar934x_nfc_setup_hwecc(nfc); if (ret) return ret; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) } else if (nand->ecc.engine_type != NAND_ECC_ENGINE_TYPE_SOFT) { dev_err(dev, "unknown ECC mode %d\n", nand->ecc.engine_type); -#else - } else if (nand->ecc.mode != NAND_ECC_SOFT) { - dev_err(dev, "unknown ECC mode %d\n", nand->ecc.mode); -#endif return -EINVAL; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) } else if ((nand->ecc.algo != NAND_ECC_ALGO_BCH) && (nand->ecc.algo != NAND_ECC_ALGO_HAMMING)) { -#else - } else if ((nand->ecc.algo != NAND_ECC_BCH) && - (nand->ecc.algo != NAND_ECC_HAMMING)) { -#endif dev_err(dev, "unknown software ECC algo %d\n", nand->ecc.algo); return -EINVAL; } @@ -1445,11 +1425,7 @@ static int ar934x_nfc_probe(struct platform_device *pdev) nand->legacy.read_byte = ar934x_nfc_read_byte; nand->legacy.write_buf = ar934x_nfc_write_buf; nand->legacy.read_buf = ar934x_nfc_read_buf; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) nand->ecc.engine_type = NAND_ECC_ENGINE_TYPE_ON_HOST; /* default */ -#else - nand->ecc.mode = NAND_ECC_HW; /* default */ -#endif nand->priv = nfc; platform_set_drvdata(pdev, nfc); @@ -1489,12 +1465,8 @@ static int ar934x_nfc_remove(struct platform_device *pdev) nfc = platform_get_drvdata(pdev); if (nfc) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0) mtd_device_unregister(nand_to_mtd(&nfc->nand_chip)); nand_cleanup(&nfc->nand_chip); -#else - nand_release(&nfc->nand_chip); -#endif ar934x_nfc_free_buf(nfc); } |