]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Input: iqs5xx - use local input_dev pointer
authorJeff LaBundy <jeff@labundy.com>
Mon, 21 Mar 2022 04:54:32 +0000 (21:54 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 21 Mar 2022 04:59:40 +0000 (21:59 -0700)
Both iqs5xx_axis_init() and iqs5xx_irq() already define a local
input_dev pointer 'input'. Use this instead of iqs5xx->input so
as to make the code a bit smaller.

Signed-off-by: Jeff LaBundy <jeff@labundy.com>
Link: https://lore.kernel.org/r/20220320025707.404544-1-jeff@labundy.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/iqs5xx.c

index b3fa71213d603421d040b2a1503482d05db4f8cd..34c4cca57d133b717325b9ab68f7e8045fe882a7 100644 (file)
@@ -486,11 +486,11 @@ static int iqs5xx_axis_init(struct i2c_client *client)
 {
        struct iqs5xx_private *iqs5xx = i2c_get_clientdata(client);
        struct touchscreen_properties *prop = &iqs5xx->prop;
-       struct input_dev *input;
+       struct input_dev *input = iqs5xx->input;
        u16 max_x, max_y;
        int error;
 
-       if (!iqs5xx->input) {
+       if (!input) {
                input = devm_input_allocate_device(&client->dev);
                if (!input)
                        return -ENOMEM;
@@ -512,11 +512,11 @@ static int iqs5xx_axis_init(struct i2c_client *client)
        if (error)
                return error;
 
-       input_set_abs_params(iqs5xx->input, ABS_MT_POSITION_X, 0, max_x, 0, 0);
-       input_set_abs_params(iqs5xx->input, ABS_MT_POSITION_Y, 0, max_y, 0, 0);
-       input_set_abs_params(iqs5xx->input, ABS_MT_PRESSURE, 0, U16_MAX, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_X, 0, max_x, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_Y, 0, max_y, 0, 0);
+       input_set_abs_params(input, ABS_MT_PRESSURE, 0, U16_MAX, 0, 0);
 
-       touchscreen_parse_properties(iqs5xx->input, true, prop);
+       touchscreen_parse_properties(input, true, prop);
 
        /*
         * The device reserves 0xFFFF for coordinates that correspond to slots
@@ -540,7 +540,7 @@ static int iqs5xx_axis_init(struct i2c_client *client)
                        return error;
        }
 
-       error = input_mt_init_slots(iqs5xx->input, IQS5XX_NUM_CONTACTS,
+       error = input_mt_init_slots(input, IQS5XX_NUM_CONTACTS,
                                    INPUT_MT_DIRECT);
        if (error)
                dev_err(&client->dev, "Failed to initialize slots: %d\n",
@@ -674,7 +674,7 @@ static irqreturn_t iqs5xx_irq(int irq, void *data)
                input_mt_slot(input, i);
                if (input_mt_report_slot_state(input, MT_TOOL_FINGER,
                                               pressure != 0)) {
-                       touchscreen_report_pos(iqs5xx->input, &iqs5xx->prop,
+                       touchscreen_report_pos(input, &iqs5xx->prop,
                                               be16_to_cpu(touch_data->abs_x),
                                               be16_to_cpu(touch_data->abs_y),
                                               true);