Re: [PATCH 1/2] regulator: as3711: Allow missing init_data for diagnostics

2014-02-11 Thread Mark Brown
On Thu, Feb 06, 2014 at 02:47:41PM +0800, Axel Lin wrote:
> The regulator core supports this to allow the configuration to be inspected
> at runtime even if no software management is enabled.

Applied, thanks.


signature.asc
Description: Digital signature


[PATCH 1/2] regulator: as3711: Allow missing init_data for diagnostics

2014-02-05 Thread Axel Lin
The regulator core supports this to allow the configuration to be inspected
at runtime even if no software management is enabled.

Signed-off-by: Axel Lin 
---
 drivers/regulator/as3711-regulator.c | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/regulator/as3711-regulator.c 
b/drivers/regulator/as3711-regulator.c
index c77a584..67fd548 100644
--- a/drivers/regulator/as3711-regulator.c
+++ b/drivers/regulator/as3711-regulator.c
@@ -221,7 +221,6 @@ static int as3711_regulator_probe(struct platform_device 
*pdev)
 {
struct as3711_regulator_pdata *pdata = dev_get_platdata(&pdev->dev);
struct as3711 *as3711 = dev_get_drvdata(pdev->dev.parent);
-   struct regulator_init_data *reg_data;
struct regulator_config config = {.dev = &pdev->dev,};
struct as3711_regulator *reg = NULL;
struct as3711_regulator *regs;
@@ -252,16 +251,10 @@ static int as3711_regulator_probe(struct platform_device 
*pdev)
}
 
for (id = 0, ri = as3711_reg_info; id < AS3711_REGULATOR_NUM; ++id, 
ri++) {
-   reg_data = pdata->init_data[id];
-
-   /* No need to register if there is no regulator data */
-   if (!reg_data)
-   continue;
-
reg = ®s[id];
reg->reg_info = ri;
 
-   config.init_data = reg_data;
+   config.init_data = pdata->init_data[id];
config.driver_data = reg;
config.regmap = as3711->regmap;
config.of_node = of_node[id];
-- 
1.8.1.2



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/