From: Pankaj Dubey Date: Wed, 30 Apr 2014 02:14:26 +0000 (+0900) Subject: mfd: syscon: Allow property as NULL in syscon_regmap_lookup_by_phandle X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45330bb434214c83841171eb4c591da74367a589;p=linux-beck.git mfd: syscon: Allow property as NULL in syscon_regmap_lookup_by_phandle If we pass syscon device node itself as first parameter to this function there is no need to parse and find syscon device node. So by allowing "property" parameter as NULL allow syscon_regmap_lookup_by_phandle to consider passed argument "np" itself as a syscon device node "syscon_np". This will help us in avoiding addition of "syscon" property in a device node which points back to same device node in device tree. Signed-off-by: Pankaj Dubey Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index dbea55de4397..b30f94179f4e 100644 --- a/drivers/mfd/syscon.c +++ b/drivers/mfd/syscon.c @@ -94,7 +94,11 @@ struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, struct device_node *syscon_np; struct regmap *regmap; - syscon_np = of_parse_phandle(np, property, 0); + if (property) + syscon_np = of_parse_phandle(np, property, 0); + else + syscon_np = np; + if (!syscon_np) return ERR_PTR(-ENODEV);