Skip to content

Commit

Permalink
Input: iqs5xx - use local input_dev pointer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jlabundy authored and dtor committed Mar 21, 2022
1 parent 8a3e634 commit 07fc21b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/input/touchscreen/iqs5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -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",
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 07fc21b

Please sign in to comment.