From: Robin Gong Date: Fri, 26 Jul 2013 02:27:18 +0000 (+0800) Subject: regulator:pfuze100: fix build warning and correct the binding doc X-Git-Tag: v3.12-rc1~191^2~4^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=205c97bcb8773f31184aedd86e229c95fffb179a;p=thirdparty%2Flinux.git regulator:pfuze100: fix build warning and correct the binding doc fix building warning and correct the binding doc Signed-off-by: Robin Gong Signed-off-by: Mark Brown --- diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt index 22e1a48f7e833..fc989b2e8057b 100644 --- a/Documentation/devicetree/bindings/regulator/pfuze100.txt +++ b/Documentation/devicetree/bindings/regulator/pfuze100.txt @@ -3,6 +3,8 @@ PFUZE100 family of regulators Required properties: - compatible: "fsl,pfuze100" - reg: I2C slave address + +Required child node: - regulators: This is the list of child nodes that specify the regulator initialization data for defined regulators. Please refer to below doc Documentation/devicetree/bindings/regulator/regulator.txt. diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index fcc7cd0d25cc2..e2f9dcf3eb219 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c @@ -295,7 +295,7 @@ static inline struct device_node *match_of_node(int index) #else static int pfuze_parse_regulators_dt(struct pfuze_chip *chip) { - return NULL; + return 0; } static inline struct regulator_init_data *match_init_data(int index)