iio: accel: mma8452: Use dev_err_probe() to simplify error handling
PATCH 1/3 iio: accel: mma8452: Use dev_err_probe() to simplify error handling
dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.
--- drivers/iio/accel/mma8452.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/iio/accel/mma8452.c +6 -14
@@ -1538,22 +1538,14 @@ static int mma8452_probe(struct i2c_client *client, data->chip_info = match->data; data->vdd_reg =devm_regulator_get (&client->dev,"vdd" ); -if (IS_ERR (data->vdd_reg)) { -if (PTR_ERR (data->vdd_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDD regulator!\n" ); -return PTR_ERR (data->vdd_reg); - } +if (IS_ERR (data->vdd_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vdd_reg), +"failed to get VDD regulator!\n" ); data->vddio_reg =devm_regulator_get (&client->dev,"vddio" ); -if (IS_ERR (data->vddio_reg)) { -if (PTR_ERR (data->vddio_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDDIO regulator!\n" ); -return PTR_ERR (data->vddio_reg); - } +if (IS_ERR (data->vddio_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vddio_reg), +"failed to get VDDIO regulator!\n" ); ret =regulator_enable (data->vdd_reg);if (ret) {
Signature · 1 line
2.7.4
PATCH 2/3 iio: light: isl29018: Use dev_err_probe() to simplify error handling
dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.
--- drivers/iio/light/isl29018.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/iio/light/isl29018.c +3 -6
@@ -746,12 +746,9 @@ static int isl29018_probe(struct i2c_client *client, chip->suspended = false; chip->vcc_reg =devm_regulator_get (&client->dev,"vcc" ); -if (IS_ERR (chip->vcc_reg)) { - err =PTR_ERR (chip->vcc_reg); -if (err != -EPROBE_DEFER ) -dev_err (&client->dev,"failed to get VCC regulator!\n" ); -return err; - } +if (IS_ERR (chip->vcc_reg)) +return dev_err_probe (&client->dev,PTR_ERR (chip->vcc_reg), +"failed to get VCC regulator!\n" ); err =regulator_enable (chip->vcc_reg);if (err) {
Signature · 1 line
2.7.4
PATCH 3/3 iio: magnetometer: mag3110: Use dev_err_probe() to simplify error handling
In reply to Anson Huangdev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.
--- drivers/iio/magnetometer/mag3110.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/iio/magnetometer/mag3110.c +6 -14
@@ -476,22 +476,14 @@ static int mag3110_probe(struct i2c_client *client, data =iio_priv (indio_dev); data->vdd_reg =devm_regulator_get (&client->dev,"vdd" ); -if (IS_ERR (data->vdd_reg)) { -if (PTR_ERR (data->vdd_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDD regulator!\n" ); -return PTR_ERR (data->vdd_reg); - } +if (IS_ERR (data->vdd_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vdd_reg), +"failed to get VDD regulator!\n" ); data->vddio_reg =devm_regulator_get (&client->dev,"vddio" ); -if (IS_ERR (data->vddio_reg)) { -if (PTR_ERR (data->vddio_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDDIO regulator!\n" ); -return PTR_ERR (data->vddio_reg); - } +if (IS_ERR (data->vddio_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vddio_reg), +"failed to get VDDIO regulator!\n" ); ret =regulator_enable (data->vdd_reg);if (ret) {
Signature · 1 line
2.7.4
Jonathan Cameron
maintainerQuoted 4 lines · On Tue, 11 Aug 2020 11:43:14 +0800 Anson Huang <[email protected]> wrote:
dev_err_probe()can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.Signed-off-by Anson Huang <[email protected]>
Hi Anson,
All look good, but will have to wait for dev_err_probe to be in my upstream tree which hasn't quite happened yet. Give me a poke if I seem to have lost these once that is true!
Thanks,
Jonathan
Quoted 37 lines
--- drivers/iio/accel/mma8452.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)drivers/iio/accel/mma8452.c +6
-14@@ -1538,22 +1538,14 @@ static int mma8452_probe(struct i2c_client *client, data->chip_info = match->data; data->vdd_reg =devm_regulator_get (&client->dev,"vdd" ); -if (IS_ERR (data->vdd_reg)) { -if (PTR_ERR (data->vdd_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDD regulator!\n" ); -return PTR_ERR (data->vdd_reg); - } +if (IS_ERR (data->vdd_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vdd_reg), +"failed to get VDD regulator!\n" ); data->vddio_reg =devm_regulator_get (&client->dev,"vddio" ); -if (IS_ERR (data->vddio_reg)) { -if (PTR_ERR (data->vddio_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDDIO regulator!\n" ); -return PTR_ERR (data->vddio_reg); - } +if (IS_ERR (data->vddio_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vddio_reg), +"failed to get VDDIO regulator!\n" ); ret =regulator_enable (data->vdd_reg);if (ret) {
Jonathan Cameron
maintainerQuoted 4 lines · On Tue, 11 Aug 2020 11:43:14 +0800 Anson Huang <[email protected]> wrote:
dev_err_probe()can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.Signed-off-by Anson Huang <[email protected]>
Sorry Anson.
You got in first, but I was working backwards through my email today and picked up Krzysztof Kozlowski's series doing the same thing across a whole set of drivers.
Sorry about that.
Jonathan
Quoted 37 lines
--- drivers/iio/accel/mma8452.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)drivers/iio/accel/mma8452.c +6
-14@@ -1538,22 +1538,14 @@ static int mma8452_probe(struct i2c_client *client, data->chip_info = match->data; data->vdd_reg =devm_regulator_get (&client->dev,"vdd" ); -if (IS_ERR (data->vdd_reg)) { -if (PTR_ERR (data->vdd_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDD regulator!\n" ); -return PTR_ERR (data->vdd_reg); - } +if (IS_ERR (data->vdd_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vdd_reg), +"failed to get VDD regulator!\n" ); data->vddio_reg =devm_regulator_get (&client->dev,"vddio" ); -if (IS_ERR (data->vddio_reg)) { -if (PTR_ERR (data->vddio_reg) == -EPROBE_DEFER ) -return -EPROBE_DEFER ; - -dev_err (&client->dev,"failed to get VDDIO regulator!\n" ); -return PTR_ERR (data->vddio_reg); - } +if (IS_ERR (data->vddio_reg)) +return dev_err_probe (&client->dev,PTR_ERR (data->vddio_reg), +"failed to get VDDIO regulator!\n" ); ret =regulator_enable (data->vdd_reg);if (ret) {