regulator:lp872x: use the private data instead of updating I2C device platform data
PATCH 1/2 regulator:lp872x: use the private data instead of updating I2C device platform data
Currently, lp872x driver parses the DT and copies values into the 'cl->dev.platform_data' if 'of_node' exists.
This may have architectural issue. Platform data is configurable through the DT or I2C board info inside the platform area.
However, lp872x driver changes this configuration when it is loaded.
The lp872x driver should get data from the platform side and use the private data, 'lp872x->pdata' instead of changing the original platform data.
--- drivers/regulator/lp872x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/regulator/lp872x.c +5 -2
@@ -903,6 +903,7 @@ static struct lp872x_platform_datastatic int lp872x_probe (struct i2c_client *cl,const struct i2c_device_id *id) {struct lp872x *lp; +struct lp872x_platform_data *pdata;int ret;const int lp872x_num_regulators[] = { [LP8720 ] =LP8720_NUM_REGULATORS ,
@@ -910,8 +911,10 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) };if (cl->dev.of_node) - cl->dev.platform_data =lp872x_populate_pdata_from_dt (&cl->dev, + pdata =lp872x_populate_pdata_from_dt (&cl->dev, (enum lp872x_id )id->driver_data); +else + pdata =dev_get_platdata (&cl->dev); lp =devm_kzalloc (&cl->dev,sizeof (struct lp872x ),GFP_KERNEL );if (!lp)
@@ -927,7 +930,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) } lp->dev = &cl->dev; - lp->pdata =dev_get_platdata (&cl->dev); + lp->pdata = pdata; lp->chipid = id->driver_data;i2c_set_clientdata (cl, lp);
Signature · 1 line
1.9.1
PATCH 2/2 regulator:lp872x: handle error case
If memory allocation gets failed on parsing the DT, then it returns error '-ENOMEM' explicitly. Then, the driver exists from the _probe().
--- drivers/regulator/lp872x.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/regulator/lp872x.c +7 -4
@@ -849,7 +849,7 @@ static struct lp872x_platform_data pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );if (!pdata) - goto out; +return ERR_PTR (-ENOMEM );of_property_read_u8 (np,"ti,general-config" , &pdata->general_config);if (of_find_property (np,"ti,update-config" ,NULL ))
@@ -857,7 +857,7 @@ static struct lp872x_platform_data pdata->dvs =devm_kzalloc (dev,sizeof (struct lp872x_dvs ),GFP_KERNEL );if (!pdata->dvs) - goto out; +return ERR_PTR (-ENOMEM ); pdata->dvs->gpio =of_get_named_gpio (np,"ti,dvs-gpio" ,0 );of_property_read_u8 (np,"ti,dvs-vsel" , (u8 *)&pdata->dvs->vsel);
@@ -910,11 +910,14 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) [LP8725] = LP8725_NUM_REGULATORS, }; -if (cl->dev.of_node) +if (cl->dev.of_node) { pdata =lp872x_populate_pdata_from_dt (&cl->dev, (enum lp872x_id )id->driver_data); -else +if (IS_ERR (pdata)) +return PTR_ERR (pdata); + }else { pdata =dev_get_platdata (&cl->dev); + } lp =devm_kzalloc (&cl->dev,sizeof (struct lp872x ),GFP_KERNEL );if (!lp)
Signature · 1 line
1.9.1
Mark Brown
maintainerApplied "regulator: lp872x: handle error case" to the regulator tree
The patch
regulator: lp872x: handle error case
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
804486b19de92449203f95027c2b207d8c5d5c79Mon Sep 17 00:00:00 2001
From: Milo Kim <[email protected]>
Date: Tue, 25 Aug 2015 14:54:12 +0900
Subject: [PATCH] regulator: lp872x: handle error case
If memory allocation gets failed on parsing the DT, then it returns error '-ENOMEM' explicitly. Then, the driver exists from the _probe().
--- drivers/regulator/lp872x.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/regulator/lp872x.c +7 -4
@@ -849,7 +849,7 @@ static struct lp872x_platform_data pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL );if (!pdata) - goto out; +return ERR_PTR (-ENOMEM );of_property_read_u8 (np,"ti,general-config" , &pdata->general_config);if (of_find_property (np,"ti,update-config" ,NULL ))
@@ -857,7 +857,7 @@ static struct lp872x_platform_data pdata->dvs =devm_kzalloc (dev,sizeof (struct lp872x_dvs ),GFP_KERNEL );if (!pdata->dvs) - goto out; +return ERR_PTR (-ENOMEM ); pdata->dvs->gpio =of_get_named_gpio (np,"ti,dvs-gpio" ,0 );of_property_read_u8 (np,"ti,dvs-vsel" , (u8 *)&pdata->dvs->vsel);
@@ -910,11 +910,14 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) [LP8725] = LP8725_NUM_REGULATORS, }; -if (cl->dev.of_node) +if (cl->dev.of_node) { pdata =lp872x_populate_pdata_from_dt (&cl->dev, (enum lp872x_id )id->driver_data); -else +if (IS_ERR (pdata)) +return PTR_ERR (pdata); + }else { pdata =dev_get_platdata (&cl->dev); + } lp =devm_kzalloc (&cl->dev,sizeof (struct lp872x ),GFP_KERNEL );if (!lp)
Signature · 1 line
2.5.0
Mark Brown
maintainerApplied "regulator: lp872x: use the private data instead of updating I2C device platform data" to the regulator tree
In reply to Milo KimThe patch
regulator: lp872x: use the private data instead of updating I2C device platform data
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
d9ffae15f7b1933c71dfb7c5e8ef61296d2833d7Mon Sep 17 00:00:00 2001
From: Milo Kim <[email protected]>
Date: Tue, 25 Aug 2015 14:54:11 +0900
Subject: [PATCH] regulator: lp872x: use the private data instead of updating
I2C device platform data
Currently, lp872x driver parses the DT and copies values into the 'cl->dev.platform_data' if 'of_node' exists.
This may have architectural issue. Platform data is configurable through the DT or I2C board info inside the platform area.
However, lp872x driver changes this configuration when it is loaded.
The lp872x driver should get data from the platform side and use the private data, 'lp872x->pdata' instead of changing the original platform data.
--- drivers/regulator/lp872x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/regulator/lp872x.c +5 -2
@@ -903,6 +903,7 @@ static struct lp872x_platform_datastatic int lp872x_probe (struct i2c_client *cl,const struct i2c_device_id *id) {struct lp872x *lp; +struct lp872x_platform_data *pdata;int ret;const int lp872x_num_regulators[] = { [LP8720 ] =LP8720_NUM_REGULATORS ,
@@ -910,8 +911,10 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) };if (cl->dev.of_node) - cl->dev.platform_data =lp872x_populate_pdata_from_dt (&cl->dev, + pdata =lp872x_populate_pdata_from_dt (&cl->dev, (enum lp872x_id )id->driver_data); +else + pdata =dev_get_platdata (&cl->dev); lp =devm_kzalloc (&cl->dev,sizeof (struct lp872x ),GFP_KERNEL );if (!lp)
@@ -927,7 +930,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) } lp->dev = &cl->dev; - lp->pdata =dev_get_platdata (&cl->dev); + lp->pdata = pdata; lp->chipid = id->driver_data;i2c_set_clientdata (cl, lp);
Signature · 1 line
2.5.0
Mark Brown
maintainerQuoted 2 lines · Milo Kim
Currently, lp872x driver parses the DT and copies values into the '
cl->dev.platform_data' if 'of_node' exists.
Please use the normal style for subject lines with a space between the subsystem and the driver.