e72b2464b1
This bumps the 4.4. kernel in master to 4.4.119. Includes more Meltdown & Spectre mitigation. * Refresh patches. * Refresh x86/config for RETPOLINE. * Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch (accepted upstream) * Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream) * Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was replaced)). Bumps from 4.4.112 to 4.4.115 were handled by Kevin Darbyshire-Bryant. Compile-tested on: ar71xx & oxnas. Signed-off-by: Stijn Segers <foss@volatilesystems.org> Tested-by: Rosen Penev <rosenp@gmail.com>
72 lines
2.1 KiB
Diff
72 lines
2.1 KiB
Diff
From 6375219951a66047805ed977b674615d152001ee Mon Sep 17 00:00:00 2001
|
|
From: Brian Norris <computersforpeace@gmail.com>
|
|
Date: Fri, 30 Oct 2015 20:33:23 -0700
|
|
Subject: [PATCH 04/11] mtd: nand: convert to nand_set_flash_node()
|
|
|
|
Used semantic patch with 'make coccicheck MODE=patch COCCI=script.cocci':
|
|
|
|
---8<----
|
|
virtual patch
|
|
|
|
@@
|
|
struct nand_chip *c;
|
|
struct device_node *d;
|
|
@@
|
|
-(c)->flash_node = (d)
|
|
+nand_set_flash_node(c, d)
|
|
---8<----
|
|
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
Reviewed-by: Marek Vasut <marex@denx.de>
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
---
|
|
drivers/mtd/nand/brcmnand/brcmnand.c | 2 +-
|
|
drivers/mtd/nand/fsmc_nand.c | 2 +-
|
|
drivers/mtd/nand/sunxi_nand.c | 2 +-
|
|
drivers/mtd/nand/vf610_nfc.c | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
|
|
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
|
|
@@ -1950,7 +1950,7 @@ static int brcmnand_init_cs(struct brcmn
|
|
mtd = &host->mtd;
|
|
chip = &host->chip;
|
|
|
|
- chip->flash_node = dn;
|
|
+ nand_set_flash_node(chip, dn);
|
|
chip->priv = host;
|
|
mtd->priv = chip;
|
|
mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
|
|
--- a/drivers/mtd/nand/fsmc_nand.c
|
|
+++ b/drivers/mtd/nand/fsmc_nand.c
|
|
@@ -1033,7 +1033,7 @@ static int __init fsmc_nand_probe(struct
|
|
nand->options = pdata->options;
|
|
nand->select_chip = fsmc_select_chip;
|
|
nand->badblockbits = 7;
|
|
- nand->flash_node = np;
|
|
+ nand_set_flash_node(nand, np);
|
|
|
|
if (pdata->width == FSMC_NAND_BW16)
|
|
nand->options |= NAND_BUSWIDTH_16;
|
|
--- a/drivers/mtd/nand/sunxi_nand.c
|
|
+++ b/drivers/mtd/nand/sunxi_nand.c
|
|
@@ -1336,7 +1336,7 @@ static int sunxi_nand_chip_init(struct d
|
|
* in the DT.
|
|
*/
|
|
nand->ecc.mode = NAND_ECC_HW;
|
|
- nand->flash_node = np;
|
|
+ nand_set_flash_node(nand, np);
|
|
nand->select_chip = sunxi_nfc_select_chip;
|
|
nand->cmd_ctrl = sunxi_nfc_cmd_ctrl;
|
|
nand->read_buf = sunxi_nfc_read_buf;
|
|
--- a/drivers/mtd/nand/vf610_nfc.c
|
|
+++ b/drivers/mtd/nand/vf610_nfc.c
|
|
@@ -714,7 +714,7 @@ static int vf610_nfc_probe(struct platfo
|
|
goto error;
|
|
}
|
|
|
|
- chip->flash_node = child;
|
|
+ nand_set_flash_node(chip, child);
|
|
}
|
|
}
|
|
|