John AudiaandHauke Mehrtens
bb3da35c90
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.78 Removed upstreamed: generic/pending-6.12/620-net-sfp-improve-Huawei-MA5671a-fixup.patch[1] generic/pending-6.12/704-net-phy-register-phy-led_triggers-during-probe-to-av.patch[2] airoha/patches-6.12/014-01-v6.13-net-airoha-fix-PSE-memory-configuration-in-airoha_fe.patch[3] airoha/patches-6.12/014-02-v6.13-net-airoha-read-default-PSE-reserved-pages-value-bef.patch[4] airoha/patches-6.12/031-01-v6.13-net-airoha-Read-completion-queue-data-in-airoha_qdma.patch[5] airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch[6] Manually rebased: airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=bbdf6d378e1ddbeadc04c57b182aadefcc3aa917 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=241cd64cf2e32b28ead151b1795cd8fef2b6e482 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a04ac7bc97afe313e10ae4c73797c668dee47c5c 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=a9ed47c3663219e20406d566f02809de05373a42 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=4cba4373abac7ba27fdb33057a29b92efa8fd15d 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.78&id=652ec118d8dc1b088e685d5562995b6665463771 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/22607 [Fix 048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
89 lines
3.1 KiB
Diff
89 lines
3.1 KiB
Diff
From 56fce75470041b5b0d92ae10637416e1a4cceb1b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
Date: Wed, 14 May 2025 08:14:54 +0200
|
|
Subject: [PATCH] mtd: rawnand: brcmnand: remove unused parameters
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
last_cmd and last_byte are now unused brcmnand_host members.
|
|
last_addr is only written and never read so we can remove it too.
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Reviewed-by: William Zhang <william.zhang@broadcom.com>
|
|
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
---
|
|
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 24 ++++++------------------
|
|
1 file changed, 6 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
@@ -310,9 +310,6 @@ struct brcmnand_host {
|
|
struct platform_device *pdev;
|
|
int cs;
|
|
|
|
- unsigned int last_cmd;
|
|
- unsigned int last_byte;
|
|
- u64 last_addr;
|
|
struct brcmnand_cfg hwcfg;
|
|
struct brcmnand_controller *ctrl;
|
|
};
|
|
@@ -2233,14 +2230,11 @@ static int brcmnand_read_page(struct nan
|
|
int oob_required, int page)
|
|
{
|
|
struct mtd_info *mtd = nand_to_mtd(chip);
|
|
- struct brcmnand_host *host = nand_get_controller_data(chip);
|
|
u8 *oob = oob_required ? (u8 *)chip->oob_poi : NULL;
|
|
u64 addr = (u64)page << chip->page_shift;
|
|
|
|
- host->last_addr = addr;
|
|
-
|
|
- return brcmnand_read(mtd, chip, host->last_addr,
|
|
- mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
|
|
+ return brcmnand_read(mtd, chip, addr, mtd->writesize >> FC_SHIFT,
|
|
+ (u32 *)buf, oob);
|
|
}
|
|
|
|
static int brcmnand_read_page_raw(struct nand_chip *chip, uint8_t *buf,
|
|
@@ -2252,11 +2246,9 @@ static int brcmnand_read_page_raw(struct
|
|
int ret;
|
|
u64 addr = (u64)page << chip->page_shift;
|
|
|
|
- host->last_addr = addr;
|
|
-
|
|
brcmnand_set_ecc_enabled(host, 0);
|
|
- ret = brcmnand_read(mtd, chip, host->last_addr,
|
|
- mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
|
|
+ ret = brcmnand_read(mtd, chip, addr, mtd->writesize >> FC_SHIFT,
|
|
+ (u32 *)buf, oob);
|
|
brcmnand_set_ecc_enabled(host, 1);
|
|
return ret;
|
|
}
|
|
@@ -2361,13 +2353,10 @@ static int brcmnand_write_page(struct na
|
|
int oob_required, int page)
|
|
{
|
|
struct mtd_info *mtd = nand_to_mtd(chip);
|
|
- struct brcmnand_host *host = nand_get_controller_data(chip);
|
|
void *oob = oob_required ? chip->oob_poi : NULL;
|
|
u64 addr = (u64)page << chip->page_shift;
|
|
|
|
- host->last_addr = addr;
|
|
-
|
|
- return brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
|
|
+ return brcmnand_write(mtd, chip, addr, (const u32 *)buf, oob);
|
|
}
|
|
|
|
static int brcmnand_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
|
|
@@ -2379,9 +2368,8 @@ static int brcmnand_write_page_raw(struc
|
|
u64 addr = (u64)page << chip->page_shift;
|
|
int ret = 0;
|
|
|
|
- host->last_addr = addr;
|
|
brcmnand_set_ecc_enabled(host, 0);
|
|
- ret = brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
|
|
+ ret = brcmnand_write(mtd, chip, addr, (const u32 *)buf, oob);
|
|
brcmnand_set_ecc_enabled(host, 1);
|
|
|
|
return ret;
|