Commit c0d08a14 authored by Florian Fainelli's avatar Florian Fainelli Committed by Miquel Raynal
Browse files

mtd: rawnand: brcmnand: Avoid pdev in brcmnand_init_cs() 



In preparation for encapsulating more of what the loop calling
brcmnand_init_cs() does, avoid using platform_device when it is the
device behind platform_device that we are using for printing errors.

No functional changes introduced.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220107184614.2670254-4-f.fainelli@gmail.com
parent 25f97138

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+4 −4
Original line number Diff line number Diff line
@@ -2771,7 +2771,7 @@ static const struct nand_controller_ops brcmnand_controller_ops = { 
static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)

{

	struct brcmnand_controller *ctrl = host->ctrl;

	struct platform_device *pdev = host->pdev;

	struct device *dev = ctrl->dev;

	struct mtd_info *mtd;

	struct nand_chip *chip;

	int ret;
@@ -2779,7 +2779,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 


	ret = of_property_read_u32(dn, "reg", &host->cs);

	if (ret) {

		dev_err(&pdev->dev, "can't get chip-select\n");

		dev_err(dev, "can't get chip-select\n");

		return -ENXIO;

	}
@@ -2788,13 +2788,13 @@ static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) 


	nand_set_flash_node(chip, dn);

	nand_set_controller_data(chip, host);

	mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",

	mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d",

				   host->cs);

	if (!mtd->name)

		return -ENOMEM;



	mtd->owner = THIS_MODULE;

	mtd->dev.parent = &pdev->dev;

	mtd->dev.parent = dev;



	chip->legacy.cmd_ctrl = brcmnand_cmd_ctrl;

	chip->legacy.cmdfunc = brcmnand_cmdfunc;