devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] regulator:pfuze100:  fix build warning and correct the binding doc
@ 2013-07-26  2:27 Robin Gong
  2013-07-26 18:07 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Robin Gong @ 2013-07-26  2:27 UTC (permalink / raw)
  To: broonie, shawn.guo, grant.likely, rob.herring, rob, lgirdwood,
	s.trumtrar
  Cc: devicetree-discuss, linux-doc, linux-kernel

fix building warning and correct the binding doc

Signed-off-by: Robin Gong <b38343@freescale.com>
---
 .../devicetree/bindings/regulator/pfuze100.txt     |    2 ++
 drivers/regulator/pfuze100-regulator.c             |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/pfuze100.txt b/Documentation/devicetree/bindings/regulator/pfuze100.txt
index 22e1a48..fc989b2 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 fcc7cd0..e2f9dcf 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)
-- 
1.7.5.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] regulator:pfuze100:  fix build warning and correct the binding doc
  2013-07-26  2:27 [PATCH] regulator:pfuze100: fix build warning and correct the binding doc Robin Gong
@ 2013-07-26 18:07 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2013-07-26 18:07 UTC (permalink / raw)
  To: Robin Gong
  Cc: shawn.guo, grant.likely, rob.herring, rob, lgirdwood, s.trumtrar,
	devicetree-discuss, linux-doc, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 129 bytes --]

On Fri, Jul 26, 2013 at 10:27:18AM +0800, Robin Gong wrote:
> fix building warning and correct the binding doc

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-26 18:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-26  2:27 [PATCH] regulator:pfuze100: fix build warning and correct the binding doc Robin Gong
2013-07-26 18:07 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).