From mboxrd@z Thu Jan 1 00:00:00 1970 From: gyungoh@gmail.com Subject: [RESUBMIT PATCH v7 7/9] regulator: sky81452: Modify Device Tree structure Date: Mon, 17 Nov 2014 17:33:08 +0900 Message-ID: <1416213190-20935-8-git-send-email-jack.yoo@skyworksinc.com> References: <1416213190-20935-1-git-send-email-jack.yoo@skyworksinc.com> Return-path: In-Reply-To: <1416213190-20935-1-git-send-email-jack.yoo@skyworksinc.com> Sender: linux-kernel-owner@vger.kernel.org To: sameo@linux.intel.com, lee.jones@linaro.org, jg1.han@samsung.com, cooloney@gmail.com, broonie@kernel.org, lgirdwood@gmail.com Cc: jack.yoo@skyworksinc.com, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, grant.likely@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, pawel.moll@arm.com, heiko@sntech.de, jason@lakedaemon.net, shawn.guo@freescale.com, treding@nvidia.com, florian.vaussard@epfl.ch, trivial@kernel.org, linux@roeck-us.net, andrew@lunn.ch, jic23@kernel.org List-Id: devicetree@vger.kernel.org From: Gyungoh Yoo Signed-off-by: Gyungoh Yoo --- Changes v7: Modified licensing text to GPLv2 Splitted Kconfig renaming from DT patch Changes v6: Added new line character at the end of line of dev_err() Changes v5: Changed DT for regulator : 'lout' node should be defined under 'regulator' Removed compatible string Modified to return EINVAL when of_node is NULL Changes v4: Removed MODULE_VERSION() Modified license to GPLv2 Changes v3: Modified to return ENODATA when of_node is NULL Modified the messages in error cases Changes v2: Added 'compatible' attribute in the driver Added message for exception or errors. drivers/regulator/sky81452-regulator.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/sky81452-regulator.c b/drivers/regulator/sky81452-regulator.c index 97aff0c..36fa045 100644 --- a/drivers/regulator/sky81452-regulator.c +++ b/drivers/regulator/sky81452-regulator.c @@ -5,9 +5,8 @@ * Author : Gyungoh Yoo * * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. + * under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -65,21 +64,29 @@ static const struct regulator_desc sky81452_reg = { }; #ifdef CONFIG_OF +static struct of_regulator_match sky81452_match = { + .name = "lout" +}; + static struct regulator_init_data *sky81452_reg_parse_dt(struct device *dev) { - struct regulator_init_data *init_data; struct device_node *np; + int ret; np = of_get_child_by_name(dev->parent->of_node, "regulator"); - if (unlikely(!np)) { - dev_err(dev, "regulator node not found"); - return NULL; + if (!np) { + dev_err(dev, "regulator node not found.\n"); + return ERR_PTR(-EINVAL); } - init_data = of_get_regulator_init_data(dev, np); - + ret = of_regulator_match(dev, np, &sky81452_match, 1); of_node_put(np); - return init_data; + if (IS_ERR_VALUE(ret)) { + dev_err(dev, "Error parsing init data. err=%d\n", ret); + return ERR_PTR(ret); + } + + return &sky81452_match.init_data; } #else static struct regulator_init_data *sky81452_reg_parse_dt(struct device *dev) @@ -107,8 +114,10 @@ static int sky81452_reg_probe(struct platform_device *pdev) config.regmap = dev_get_drvdata(dev->parent); rdev = devm_regulator_register(dev, &sky81452_reg, &config); - if (IS_ERR(rdev)) + if (IS_ERR(rdev)) { + dev_err(dev, "failed to register. err=%ld\n", PTR_ERR(rdev)); return PTR_ERR(rdev); + } platform_set_drvdata(pdev, rdev); @@ -126,5 +135,4 @@ module_platform_driver(sky81452_reg_driver); MODULE_DESCRIPTION("Skyworks SKY81452 Regulator driver"); MODULE_AUTHOR("Gyungoh Yoo "); -MODULE_LICENSE("GPL"); -MODULE_VERSION("1.0"); +MODULE_LICENSE("GPL v2"); -- 1.9.1