]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: wdt87xx_i2c - switch to use dev_err_probe()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Jan 2026 20:33:52 +0000 (12:33 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 20 Jan 2026 20:37:52 +0000 (12:37 -0800)
Switch to use dev_err_probe() to simplify the error path and
unify a message template. With that being done, drop the now no-op
message for -ENOMEM as allocator will print a big warning anyway
and remove duplicate message for devm_request_threaded_irq().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260113082445.44186-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/wdt87xx_i2c.c

index 88d376090e6e6fb5eab90d65485e076fd44f07eb..1e2a6bbb88cb027de783bf47453fe03730a52986 100644 (file)
@@ -1026,10 +1026,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)
        int error;
 
        input = devm_input_allocate_device(dev);
-       if (!input) {
-               dev_err(dev, "failed to allocate input device\n");
+       if (!input)
                return -ENOMEM;
-       }
        wdt->input = input;
 
        input->name = "WDT87xx Touchscreen";
@@ -1053,10 +1051,8 @@ static int wdt87xx_ts_create_input_device(struct wdt87xx_data *wdt)
                            INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
 
        error = input_register_device(input);
-       if (error) {
-               dev_err(dev, "failed to register input device: %d\n", error);
-               return error;
-       }
+       if (error)
+               return dev_err_probe(dev, error, "failed to register input device\n");
 
        return 0;
 }
@@ -1096,10 +1092,8 @@ static int wdt87xx_ts_probe(struct i2c_client *client)
                                          NULL, wdt87xx_ts_interrupt,
                                          IRQF_ONESHOT,
                                          client->name, wdt);
-       if (error) {
-               dev_err(&client->dev, "request irq failed: %d\n", error);
+       if (error)
                return error;
-       }
 
        return 0;
 }