| Message ID | 20200827185829.30096-28-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,01/27] Input: gpio_keys_polled - Simplify with dev_err_probe() | expand |
On Thu, Aug 27, 2020 at 10:00 PM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > 'dev' is shorter and simpler than '&client->dev' and in few cases it > allows to skip line wrapping. Probe function uses '&client->dev' a lot, > so this improves readability slightly. > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Changes since v2: > 1. New patch > --- > drivers/input/touchscreen/bu21029_ts.c | 37 +++++++++++--------------- > 1 file changed, 16 insertions(+), 21 deletions(-) > > diff --git a/drivers/input/touchscreen/bu21029_ts.c b/drivers/input/touchscreen/bu21029_ts.c > index 96c178b606dc..78e256254764 100644 > --- a/drivers/input/touchscreen/bu21029_ts.c > +++ b/drivers/input/touchscreen/bu21029_ts.c > @@ -334,6 +334,7 @@ static void bu21029_stop_chip(struct input_dev *dev) > static int bu21029_probe(struct i2c_client *client, > const struct i2c_device_id *id) > { > + struct device *dev = &client->dev; > struct bu21029_ts_data *bu21029; > struct input_dev *in_dev; > int error; > @@ -342,37 +343,33 @@ static int bu21029_probe(struct i2c_client *client, > I2C_FUNC_SMBUS_WRITE_BYTE | > I2C_FUNC_SMBUS_WRITE_BYTE_DATA | > I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { > - dev_err(&client->dev, > - "i2c functionality support is not sufficient\n"); > + dev_err(dev, "i2c functionality support is not sufficient\n"); > return -EIO; > } > > - bu21029 = devm_kzalloc(&client->dev, sizeof(*bu21029), GFP_KERNEL); > + bu21029 = devm_kzalloc(dev, sizeof(*bu21029), GFP_KERNEL); > if (!bu21029) > return -ENOMEM; > > - error = device_property_read_u32(&client->dev, "rohm,x-plate-ohms", > - &bu21029->x_plate_ohms); > + error = device_property_read_u32(dev, "rohm,x-plate-ohms", &bu21029->x_plate_ohms); > if (error) { > - dev_err(&client->dev, > - "invalid 'x-plate-ohms' supplied: %d\n", error); > + dev_err(dev, "invalid 'x-plate-ohms' supplied: %d\n", error); > return error; > } > > - bu21029->vdd = devm_regulator_get(&client->dev, "vdd"); > + bu21029->vdd = devm_regulator_get(dev, "vdd"); > if (IS_ERR(bu21029->vdd)) > - return dev_err_probe(&client->dev, PTR_ERR(bu21029->vdd), > + return dev_err_probe(dev, PTR_ERR(bu21029->vdd), > "failed to acquire 'vdd' supply\n"); > > - bu21029->reset_gpios = devm_gpiod_get_optional(&client->dev, > - "reset", GPIOD_OUT_HIGH); > + bu21029->reset_gpios = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); > if (IS_ERR(bu21029->reset_gpios)) > - return dev_err_probe(&client->dev, PTR_ERR(bu21029->reset_gpios), > + return dev_err_probe(dev, PTR_ERR(bu21029->reset_gpios), > "failed to acquire 'reset' gpio\n"); > > - in_dev = devm_input_allocate_device(&client->dev); > + in_dev = devm_input_allocate_device(dev); > if (!in_dev) { > - dev_err(&client->dev, "unable to allocate input device\n"); > + dev_err(dev, "unable to allocate input device\n"); > return -ENOMEM; > } > > @@ -394,19 +391,17 @@ static int bu21029_probe(struct i2c_client *client, > input_set_drvdata(in_dev, bu21029); > > irq_set_status_flags(client->irq, IRQ_NOAUTOEN); > - error = devm_request_threaded_irq(&client->dev, client->irq, > - NULL, bu21029_touch_soft_irq, > - IRQF_ONESHOT, DRIVER_NAME, bu21029); > + error = devm_request_threaded_irq(dev, client->irq, NULL, > + bu21029_touch_soft_irq, IRQF_ONESHOT, > + DRIVER_NAME, bu21029); > if (error) { > - dev_err(&client->dev, > - "unable to request touch irq: %d\n", error); > + dev_err(dev, "unable to request touch irq: %d\n", error); > return error; > } > > error = input_register_device(in_dev); > if (error) { > - dev_err(&client->dev, > - "unable to register input device: %d\n", error); > + dev_err(dev, "unable to register input device: %d\n", error); > return error; > } > > -- > 2.17.1 >
diff --git a/drivers/input/touchscreen/bu21029_ts.c b/drivers/input/touchscreen/bu21029_ts.c index 96c178b606dc..78e256254764 100644 --- a/drivers/input/touchscreen/bu21029_ts.c +++ b/drivers/input/touchscreen/bu21029_ts.c @@ -334,6 +334,7 @@ static void bu21029_stop_chip(struct input_dev *dev) static int bu21029_probe(struct i2c_client *client, const struct i2c_device_id *id) { + struct device *dev = &client->dev; struct bu21029_ts_data *bu21029; struct input_dev *in_dev; int error; @@ -342,37 +343,33 @@ static int bu21029_probe(struct i2c_client *client, I2C_FUNC_SMBUS_WRITE_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA | I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { - dev_err(&client->dev, - "i2c functionality support is not sufficient\n"); + dev_err(dev, "i2c functionality support is not sufficient\n"); return -EIO; } - bu21029 = devm_kzalloc(&client->dev, sizeof(*bu21029), GFP_KERNEL); + bu21029 = devm_kzalloc(dev, sizeof(*bu21029), GFP_KERNEL); if (!bu21029) return -ENOMEM; - error = device_property_read_u32(&client->dev, "rohm,x-plate-ohms", - &bu21029->x_plate_ohms); + error = device_property_read_u32(dev, "rohm,x-plate-ohms", &bu21029->x_plate_ohms); if (error) { - dev_err(&client->dev, - "invalid 'x-plate-ohms' supplied: %d\n", error); + dev_err(dev, "invalid 'x-plate-ohms' supplied: %d\n", error); return error; } - bu21029->vdd = devm_regulator_get(&client->dev, "vdd"); + bu21029->vdd = devm_regulator_get(dev, "vdd"); if (IS_ERR(bu21029->vdd)) - return dev_err_probe(&client->dev, PTR_ERR(bu21029->vdd), + return dev_err_probe(dev, PTR_ERR(bu21029->vdd), "failed to acquire 'vdd' supply\n"); - bu21029->reset_gpios = devm_gpiod_get_optional(&client->dev, - "reset", GPIOD_OUT_HIGH); + bu21029->reset_gpios = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(bu21029->reset_gpios)) - return dev_err_probe(&client->dev, PTR_ERR(bu21029->reset_gpios), + return dev_err_probe(dev, PTR_ERR(bu21029->reset_gpios), "failed to acquire 'reset' gpio\n"); - in_dev = devm_input_allocate_device(&client->dev); + in_dev = devm_input_allocate_device(dev); if (!in_dev) { - dev_err(&client->dev, "unable to allocate input device\n"); + dev_err(dev, "unable to allocate input device\n"); return -ENOMEM; } @@ -394,19 +391,17 @@ static int bu21029_probe(struct i2c_client *client, input_set_drvdata(in_dev, bu21029); irq_set_status_flags(client->irq, IRQ_NOAUTOEN); - error = devm_request_threaded_irq(&client->dev, client->irq, - NULL, bu21029_touch_soft_irq, - IRQF_ONESHOT, DRIVER_NAME, bu21029); + error = devm_request_threaded_irq(dev, client->irq, NULL, + bu21029_touch_soft_irq, IRQF_ONESHOT, + DRIVER_NAME, bu21029); if (error) { - dev_err(&client->dev, - "unable to request touch irq: %d\n", error); + dev_err(dev, "unable to request touch irq: %d\n", error); return error; } error = input_register_device(in_dev); if (error) { - dev_err(&client->dev, - "unable to register input device: %d\n", error); + dev_err(dev, "unable to register input device: %d\n", error); return error; }
'dev' is shorter and simpler than '&client->dev' and in few cases it allows to skip line wrapping. Probe function uses '&client->dev' a lot, so this improves readability slightly. Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v2: 1. New patch --- drivers/input/touchscreen/bu21029_ts.c | 37 +++++++++++--------------- 1 file changed, 16 insertions(+), 21 deletions(-)