Create a helper variable struct device *dev in probe() to make the code more compact and easier to read. Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> --- drivers/input/touchscreen/zinitix.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/zinitix.c b/drivers/input/touchscreen/zinitix.c index 8bd03278ad9a..cd13075ae3ab 100644 --- a/drivers/input/touchscreen/zinitix.c +++ b/drivers/input/touchscreen/zinitix.c @@ -503,15 +503,16 @@ static int zinitix_init_input_dev(struct bt541_ts_data *bt541) static int zinitix_ts_probe(struct i2c_client *client) { struct bt541_ts_data *bt541; + struct device *dev = &client->dev; int error; if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { - dev_err(&client->dev, + dev_err(dev, "Failed to assert adapter's support for plain I2C.\n"); return -ENXIO; } - bt541 = devm_kzalloc(&client->dev, sizeof(*bt541), GFP_KERNEL); + bt541 = devm_kzalloc(dev, sizeof(*bt541), GFP_KERNEL); if (!bt541) return -ENOMEM; @@ -520,28 +521,28 @@ static int zinitix_ts_probe(struct i2c_client *client) error = zinitix_init_regulators(bt541); if (error) { - dev_err(&client->dev, + dev_err(dev, "Failed to initialize regulators: %d\n", error); return error; } - error = devm_request_threaded_irq(&client->dev, client->irq, + error = devm_request_threaded_irq(dev, client->irq, NULL, zinitix_ts_irq_handler, IRQF_ONESHOT | IRQF_NO_AUTOEN, client->name, bt541); if (error) { - dev_err(&client->dev, "Failed to request IRQ: %d\n", error); + dev_err(dev, "Failed to request IRQ: %d\n", error); return error; } error = zinitix_init_input_dev(bt541); if (error) { - dev_err(&client->dev, + dev_err(dev, "Failed to initialize input device: %d\n", error); return error; } - error = device_property_read_u32(&client->dev, "zinitix,mode", + error = device_property_read_u32(dev, "zinitix,mode", &bt541->zinitix_mode); if (error < 0) { /* fall back to mode 2 */ @@ -553,7 +554,7 @@ static int zinitix_ts_probe(struct i2c_client *client) * If there are devices that don't support mode 2, support * for other modes (0, 1) will be needed. */ - dev_err(&client->dev, + dev_err(dev, "Malformed zinitix,mode property, must be 2 (supplied: %d)\n", bt541->zinitix_mode); return -EINVAL; -- 2.35.1