| Message ID | 1448935287-144366-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | d121b66d25adfa8b631dc59511ebc1d600ad5111 |
| Headers | show |
Looks good. On 15-11-30 06:01 PM, Brian Norris wrote: > We don't actually need to stash a copy of this device_node indefinitely; > we only need it in brcmnand_init_cs(). > > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > Cc: <bcm-kernel-feedback-list@broadcom.com> > Cc: Kamal Dasu <kdasu.kdev@gmail.com> Acked-by: Scott Branden <sbranden@broadcom.com> > --- > drivers/mtd/nand/brcmnand/brcmnand.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c > index ad756f626f4b..35d78f739d91 100644 > --- a/drivers/mtd/nand/brcmnand/brcmnand.c > +++ b/drivers/mtd/nand/brcmnand/brcmnand.c > @@ -176,7 +176,6 @@ struct brcmnand_cfg { > > struct brcmnand_host { > struct list_head node; > - struct device_node *of_node; > > struct nand_chip chip; > struct mtd_info mtd; > @@ -1902,10 +1901,9 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) > return 0; > } > > -static int brcmnand_init_cs(struct brcmnand_host *host) > +static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) > { > struct brcmnand_controller *ctrl = host->ctrl; > - struct device_node *dn = host->of_node; > struct platform_device *pdev = host->pdev; > struct mtd_info *mtd; > struct nand_chip *chip; > @@ -2239,9 +2237,8 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) > } > host->pdev = pdev; > host->ctrl = ctrl; > - host->of_node = child; > > - ret = brcmnand_init_cs(host); > + ret = brcmnand_init_cs(host, child); > if (ret) { > devm_kfree(dev, host); > continue; /* Try all chip-selects */ >
On Tue, Dec 01, 2015 at 09:17:27AM -0800, Scott Branden wrote: > Looks good. > > On 15-11-30 06:01 PM, Brian Norris wrote: > >We don't actually need to stash a copy of this device_node indefinitely; > >we only need it in brcmnand_init_cs(). > > > >Signed-off-by: Brian Norris <computersforpeace@gmail.com> > >Cc: <bcm-kernel-feedback-list@broadcom.com> > >Cc: Kamal Dasu <kdasu.kdev@gmail.com> > Acked-by: Scott Branden <sbranden@broadcom.com> Applied
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index ad756f626f4b..35d78f739d91 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -176,7 +176,6 @@ struct brcmnand_cfg { struct brcmnand_host { struct list_head node; - struct device_node *of_node; struct nand_chip chip; struct mtd_info mtd; @@ -1902,10 +1901,9 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) return 0; } -static int brcmnand_init_cs(struct brcmnand_host *host) +static int brcmnand_init_cs(struct brcmnand_host *host, struct device_node *dn) { struct brcmnand_controller *ctrl = host->ctrl; - struct device_node *dn = host->of_node; struct platform_device *pdev = host->pdev; struct mtd_info *mtd; struct nand_chip *chip; @@ -2239,9 +2237,8 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) } host->pdev = pdev; host->ctrl = ctrl; - host->of_node = child; - ret = brcmnand_init_cs(host); + ret = brcmnand_init_cs(host, child); if (ret) { devm_kfree(dev, host); continue; /* Try all chip-selects */
We don't actually need to stash a copy of this device_node indefinitely; we only need it in brcmnand_init_cs(). Signed-off-by: Brian Norris <computersforpeace@gmail.com> Cc: <bcm-kernel-feedback-list@broadcom.com> Cc: Kamal Dasu <kdasu.kdev@gmail.com> --- drivers/mtd/nand/brcmnand/brcmnand.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)