mtd: brcmnand: drop brcmnand_host::of_node field

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Tue Jan 12 15:59:11 PST 2016


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=d121b66d25adfa8b631dc59511ebc1d600ad5111
Commit:     d121b66d25adfa8b631dc59511ebc1d600ad5111
Parent:     74e98be45fe069fcdb00f35eccbb179309ab65cd
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Mon Nov 30 18:01:27 2015 -0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Dec 1 11:18:14 2015 -0800

    mtd: brcmnand: drop brcmnand_host::of_node field
    
    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 at gmail.com>
    Cc: <bcm-kernel-feedback-list at broadcom.com>
    Cc: Kamal Dasu <kdasu.kdev at gmail.com>
    Acked-by: Scott Branden <sbranden at broadcom.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.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 ad756f6..35d78f7 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 */



More information about the linux-mtd-cvs mailing list