mtd: nand: mpc5121: use 'of_machine_is_compatible' to simplify code
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>
Sun, 10 Jan 2016 06:46:39 +0000 (07:46 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Sat, 23 Jan 2016 00:35:25 +0000 (16:35 -0800)
The current code is the same as 'of_machine_is_compatible'.
So use it in order to remove a few lines of code and to be more
consistent with other parts of the kernel.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/mpc5121_nfc.c

index 6b93e89..5d7843f 100644 (file)
@@ -626,7 +626,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
 
 static int mpc5121_nfc_probe(struct platform_device *op)
 {
-       struct device_node *rootnode, *dn = op->dev.of_node;
+       struct device_node *dn = op->dev.of_node;
        struct clk *clk;
        struct device *dev = &op->dev;
        struct mpc5121_nfc_prv *prv;
@@ -712,18 +712,15 @@ static int mpc5121_nfc_probe(struct platform_device *op)
        chip->ecc.mode = NAND_ECC_SOFT;
 
        /* Support external chip-select logic on ADS5121 board */
-       rootnode = of_find_node_by_path("/");
-       if (of_device_is_compatible(rootnode, "fsl,mpc5121ads")) {
+       if (of_machine_is_compatible("fsl,mpc5121ads")) {
                retval = ads5121_chipselect_init(mtd);
                if (retval) {
                        dev_err(dev, "Chipselect init error!\n");
-                       of_node_put(rootnode);
                        return retval;
                }
 
                chip->select_chip = ads5121_select_chip;
        }
-       of_node_put(rootnode);
 
        /* Enable NFC clock */
        clk = devm_clk_get(dev, "ipg");