From: Nuno Sa <nuno.sa@xxxxxxxxxx>
Simplify the probe error path by using dev_err_probe().
Signed-off-by: Nuno Sa <nuno.sa@xxxxxxxxxx>
---
drivers/input/keyboard/adp5588-keys.c | 70 +++++++++++++++--------------------
1 file changed, 29 insertions(+), 41 deletions(-)
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index 0152e4fa088c..60a7cb040af7 100644
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -439,10 +439,9 @@ static int adp5588_gpio_add(struct adp5588_kpad *kpad)
kpad->gc.owner = THIS_MODULE;
if (device_property_present(dev, "interrupt-controller")) {
- if (!kpad->client->irq) {
- dev_err(dev, "Unable to serve as interrupt controller without interrupt");
- return -EINVAL;
- }
+ if (!kpad->client->irq)
+ return dev_err_probe(dev, -EINVAL,
+ "Unable to serve as interrupt controller without interrupt");
girq = &kpad->gc.irq;
gpio_irq_chip_set_chip(girq, &adp5588_irq_chip);
@@ -453,10 +452,8 @@ static int adp5588_gpio_add(struct adp5588_kpad *kpad)
mutex_init(&kpad->gpio_lock);
error = devm_gpiochip_add_data(dev, &kpad->gc, kpad);
- if (error) {
- dev_err(dev, "gpiochip_add failed: %d\n", error);
- return error;
- }
+ if (error)
+ return dev_err_probe(dev, error, "gpiochip_add failed\n");
for (i = 0; i <= ADP5588_BANK(ADP5588_MAXGPIO); i++) {
error = adp5588_read(kpad->client,
@@ -680,21 +677,19 @@ static int adp5588_fw_parse(struct adp5588_kpad *kpad)
return 0;
}
- if (!client->irq) {
- dev_err(&client->dev, "Keypad configured but no IRQ present\n");
- return -EINVAL;
- }
+ if (!client->irq)
+ return dev_err_probe(&client->dev, -EINVAL,
+ "Keypad configured but no IRQ present\n");
ret = matrix_keypad_parse_properties(&client->dev, &kpad->rows,
&kpad->cols);
if (ret)
return ret;
- if (kpad->rows > ADP5588_ROWS_MAX || kpad->cols > ADP5588_COLS_MAX) {
- dev_err(&client->dev, "Invalid nr of rows(%u) or cols(%u)\n",
- kpad->rows, kpad->cols);
- return -EINVAL;
- }
+ if (kpad->rows > ADP5588_ROWS_MAX || kpad->cols > ADP5588_COLS_MAX)
+ return dev_err_probe(&client->dev, -EINVAL,
+ "Invalid nr of rows(%u) or cols(%u)\n",
+ kpad->rows, kpad->cols);
ret = matrix_keypad_build_keymap(NULL, NULL, kpad->rows, kpad->cols,
kpad->keycode, kpad->input);
@@ -714,11 +709,10 @@ static int adp5588_fw_parse(struct adp5588_kpad *kpad)
return 0;
}
- if (kpad->nkeys_unlock > ARRAY_SIZE(kpad->unlock_keys)) {
- dev_err(&client->dev, "number of unlock keys(%d) > (%zu)\n",
- kpad->nkeys_unlock, ARRAY_SIZE(kpad->unlock_keys));
- return -EINVAL;
- }
+ if (kpad->nkeys_unlock > ARRAY_SIZE(kpad->unlock_keys))
+ return dev_err_probe(&client->dev, -EINVAL,
+ "number of unlock keys(%d) > (%zu)\n",
+ kpad->nkeys_unlock, ARRAY_SIZE(kpad->unlock_keys));
ret = device_property_read_u32_array(&client->dev, "adi,unlock-keys",
kpad->unlock_keys,
@@ -735,11 +729,10 @@ static int adp5588_fw_parse(struct adp5588_kpad *kpad)
* part of keypad matrix to be used and if a reliable way of
* using GPIs is found, this condition can be removed/lightened.
*/
- if (kpad->unlock_keys[i] >= kpad->cols * kpad->rows) {
- dev_err(&client->dev, "Invalid unlock key(%d)\n",
- kpad->unlock_keys[i]);
- return -EINVAL;
- }
+ if (kpad->unlock_keys[i] >= kpad->cols * kpad->rows)
+ return dev_err_probe(&client->dev, -EINVAL,
+ "Invalid unlock key(%d)\n",
+ kpad->unlock_keys[i]);
/*
* Firmware properties keys start from 0 but on the device they
@@ -761,10 +754,9 @@ static int adp5588_probe(struct i2c_client *client)
u8 id;
if (!i2c_check_functionality(client->adapter,
- I2C_FUNC_SMBUS_BYTE_DATA)) {
- dev_err(&client->dev, "SMBUS Byte Data not Supported\n");
- return -EIO;
- }
+ I2C_FUNC_SMBUS_BYTE_DATA))
+ return dev_err_probe(&client->dev, -EIO,
+ "SMBUS Byte Data not Supported\n");
kpad = devm_kzalloc(&client->dev, sizeof(*kpad), GFP_KERNEL);
if (!kpad)
@@ -814,11 +806,9 @@ static int adp5588_probe(struct i2c_client *client)
input->id.version = revid;
error = input_register_device(input);
- if (error) {
- dev_err(&client->dev, "unable to register input device: %d\n",
- error);
- return error;
- }
+ if (error)
+ return dev_err_probe(&client->dev, error,
+ "unable to register input device\n");
error = adp5588_setup(kpad);
if (error)
@@ -833,11 +823,9 @@ static int adp5588_probe(struct i2c_client *client)
adp5588_hard_irq, adp5588_thread_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
client->dev.driver->name, kpad);
- if (error) {
- dev_err(&client->dev, "failed to request irq %d: %d\n",
- client->irq, error);
- return error;
- }
+ if (error)
+ return dev_err_probe(&client->dev, error,
+ "failed to request irq %d\n", client->irq);
}
dev_info(&client->dev, "Rev.%d controller\n", revid);
--
2.46.1
