102-v5.18-mtd-rawnand-brcmnand-Avoid-pdev-in-brcmnand_init_cs.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From: Florian Fainelli <[email protected]>
  2. Subject: [PATCH v3 3/9] mtd: rawnand: brcmnand: Avoid pdev in brcmnand_init_cs()
  3. Date: Fri, 07 Jan 2022 10:46:08 -0800
  4. Content-Type: text/plain; charset="utf-8"
  5. In preparation for encapsulating more of what the loop calling
  6. brcmnand_init_cs() does, avoid using platform_device when it is the
  7. device behind platform_device that we are using for printing errors.
  8. No functional changes introduced.
  9. Signed-off-by: Florian Fainelli <[email protected]>
  10. ---
  11. drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++----
  12. 1 file changed, 4 insertions(+), 4 deletions(-)
  13. --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
  14. +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
  15. @@ -2814,7 +2814,7 @@ static const struct nand_controller_ops
  16. static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn)
  17. {
  18. struct brcmnand_controller *ctrl = host->ctrl;
  19. - struct platform_device *pdev = host->pdev;
  20. + struct device *dev = ctrl->dev;
  21. struct mtd_info *mtd;
  22. struct nand_chip *chip;
  23. int ret;
  24. @@ -2822,7 +2822,7 @@ static int brcmnand_init_cs(struct brcmn
  25. ret = of_property_read_u32(dn, "reg", &host->cs);
  26. if (ret) {
  27. - dev_err(&pdev->dev, "can't get chip-select\n");
  28. + dev_err(dev, "can't get chip-select\n");
  29. return -ENXIO;
  30. }
  31. @@ -2831,13 +2831,13 @@ static int brcmnand_init_cs(struct brcmn
  32. nand_set_flash_node(chip, dn);
  33. nand_set_controller_data(chip, host);
  34. - mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",
  35. + mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d",
  36. host->cs);
  37. if (!mtd->name)
  38. return -ENOMEM;
  39. mtd->owner = THIS_MODULE;
  40. - mtd->dev.parent = &pdev->dev;
  41. + mtd->dev.parent = dev;
  42. chip->legacy.cmd_ctrl = brcmnand_cmd_ctrl;
  43. chip->legacy.cmdfunc = brcmnand_cmdfunc;