mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
||
|
|
Subject: [PATCH v3 1/9] mtd: rawnand: brcmnand: Assign soc as early as possible
|
||
|
|
Date: Fri, 07 Jan 2022 10:46:06 -0800
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
|
||
|
|
In order to key off the brcmnand_probe() code in subsequent changes
|
||
|
|
depending upon ctrl->soc, assign that variable as early as possible,
|
||
|
|
instead of much later when we have checked that it is non-NULL.
|
||
|
|
|
||
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
||
|
|
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
||
|
|
@@ -2949,6 +2949,7 @@ int brcmnand_probe(struct platform_devic
|
||
|
|
|
||
|
|
dev_set_drvdata(dev, ctrl);
|
||
|
|
ctrl->dev = dev;
|
||
|
|
+ ctrl->soc = soc;
|
||
|
|
|
||
|
|
init_completion(&ctrl->done);
|
||
|
|
init_completion(&ctrl->dma_done);
|
||
|
|
@@ -3089,8 +3090,6 @@ int brcmnand_probe(struct platform_devic
|
||
|
|
* interesting ways
|
||
|
|
*/
|
||
|
|
if (soc) {
|
||
|
|
- ctrl->soc = soc;
|
||
|
|
-
|
||
|
|
ret = devm_request_irq(dev, ctrl->irq, brcmnand_irq, 0,
|
||
|
|
DRV_NAME, ctrl);
|
||
|
|
|