@@ -206,12 +206,13 @@ static int ili210x_i2c_probe(struct i2c_client *client,
xmax = panel.finger_max.x_low | (panel.finger_max.x_high << 8);
ymax = panel.finger_max.y_low | (panel.finger_max.y_high << 8);
- priv = kzalloc(sizeof(*priv), GFP_KERNEL);
- input = input_allocate_device();
- if (!priv || !input) {
- error = -ENOMEM;
- goto err_free_mem;
- }
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ input = devm_input_allocate_device(dev);
+ if (!input)
+ return -ENOMEM;
priv->client = client;
priv->input = input;
@@ -273,8 +274,6 @@ static int ili210x_i2c_probe(struct i2c_client *client,
err_free_irq:
free_irq(client->irq, priv);
err_free_mem:
- input_free_device(input);
- kfree(priv);
return error;
}
@@ -285,8 +284,6 @@ static int ili210x_i2c_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, &ili210x_attr_group);
free_irq(priv->client->irq, priv);
cancel_delayed_work_sync(&priv->dwork);
- input_unregister_device(priv->input);
- kfree(priv);
return 0;
}
Convert the driver to dev-managed allocations. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Henrik Rydberg <rydberg@bitmath.org> Cc: Olivier Sobrie <olivier@sobrie.be> Cc: Philipp Puschmann <pp@emlix.com> To: linux-input@vger.kernel.org --- V2: No change V3: - Split check for devm_kzalloc() and devm_input_allocate_device() failure - Drop input_unregister_device() from ili210x_i2c_remove() V4: No change --- drivers/input/touchscreen/ili210x.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)