]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Input: stmfts - use dev struct directly
authorDavid Heidelberg <david@ixit.cz>
Sun, 26 Apr 2026 20:02:06 +0000 (13:02 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 26 Apr 2026 21:32:52 +0000 (14:32 -0700)
Makes the code better readable and noticably shorter.

Signed-off-by: David Heidelberg <david@ixit.cz>
Link: https://patch.msgid.link/20260409-stmfts5-v4-2-64fe62027db5@ixit.cz
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/stmfts.c

index def6bd0c8e05946c4ab76490ab47e614ffbf91d0..86159e3b1a8b07ed09ea73124ed75531565c3d51 100644 (file)
@@ -619,6 +619,7 @@ static int stmfts_enable_led(struct stmfts_data *sdata)
 
 static int stmfts_probe(struct i2c_client *client)
 {
+       struct device *dev = &client->dev;
        int err;
        struct stmfts_data *sdata;
 
@@ -627,7 +628,7 @@ static int stmfts_probe(struct i2c_client *client)
                                                I2C_FUNC_SMBUS_I2C_BLOCK))
                return -ENODEV;
 
-       sdata = devm_kzalloc(&client->dev, sizeof(*sdata), GFP_KERNEL);
+       sdata = devm_kzalloc(dev, sizeof(*sdata), GFP_KERNEL);
        if (!sdata)
                return -ENOMEM;
 
@@ -639,13 +640,13 @@ static int stmfts_probe(struct i2c_client *client)
 
        sdata->regulators[STMFTS_REGULATOR_VDD].supply = "vdd";
        sdata->regulators[STMFTS_REGULATOR_AVDD].supply = "avdd";
-       err = devm_regulator_bulk_get(&client->dev,
+       err = devm_regulator_bulk_get(dev,
                                      ARRAY_SIZE(sdata->regulators),
                                      sdata->regulators);
        if (err)
                return err;
 
-       sdata->input = devm_input_allocate_device(&client->dev);
+       sdata->input = devm_input_allocate_device(dev);
        if (!sdata->input)
                return -ENOMEM;
 
@@ -664,8 +665,7 @@ static int stmfts_probe(struct i2c_client *client)
        input_set_abs_params(sdata->input, ABS_MT_PRESSURE, 0, 255, 0, 0);
        input_set_abs_params(sdata->input, ABS_DISTANCE, 0, 255, 0, 0);
 
-       sdata->use_key = device_property_read_bool(&client->dev,
-                                                  "touch-key-connected");
+       sdata->use_key = device_property_read_bool(dev, "touch-key-connected");
        if (sdata->use_key) {
                input_set_capability(sdata->input, EV_KEY, KEY_MENU);
                input_set_capability(sdata->input, EV_KEY, KEY_BACK);
@@ -685,20 +685,20 @@ static int stmfts_probe(struct i2c_client *client)
         * interrupts. To be on the safe side it's better to not enable
         * the interrupts during their request.
         */
-       err = devm_request_threaded_irq(&client->dev, client->irq,
+       err = devm_request_threaded_irq(dev, client->irq,
                                        NULL, stmfts_irq_handler,
                                        IRQF_ONESHOT | IRQF_NO_AUTOEN,
                                        "stmfts_irq", sdata);
        if (err)
                return err;
 
-       dev_dbg(&client->dev, "initializing ST-Microelectronics FTS...\n");
+       dev_dbg(dev, "initializing ST-Microelectronics FTS...\n");
 
        err = stmfts_power_on(sdata);
        if (err)
                return err;
 
-       err = devm_add_action_or_reset(&client->dev, stmfts_power_off, sdata);
+       err = devm_add_action_or_reset(dev, stmfts_power_off, sdata);
        if (err)
                return err;
 
@@ -715,13 +715,13 @@ static int stmfts_probe(struct i2c_client *client)
                         * without LEDs. The ledvdd regulator pointer will be
                         * used as a flag.
                         */
-                       dev_warn(&client->dev, "unable to use touchkey leds\n");
+                       dev_warn(dev, "unable to use touchkey leds\n");
                        sdata->ledvdd = NULL;
                }
        }
 
-       pm_runtime_enable(&client->dev);
-       device_enable_async_suspend(&client->dev);
+       pm_runtime_enable(dev);
+       device_enable_async_suspend(dev);
 
        return 0;
 }