Input: MT - Add flags to input_mt_init_slots()
Preparing to move more repeated code into the mt core, add a flags argument to the input_mt_slots_init() function. Reviewed-and-tested-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> Tested-by: Ping Cheng <pingc@wacom.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
This commit is contained in:
@@ -1152,7 +1152,7 @@ static int __devinit mxt_probe(struct i2c_client *client,
|
||||
|
||||
/* For multi touch */
|
||||
num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
|
||||
error = input_mt_init_slots(input_dev, num_mt_slots);
|
||||
error = input_mt_init_slots(input_dev, num_mt_slots, 0);
|
||||
if (error)
|
||||
goto err_free_object;
|
||||
input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
|
||||
|
@@ -571,7 +571,7 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
|
||||
input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
|
||||
0, CY_MAXZ, 0, 0);
|
||||
|
||||
input_mt_init_slots(input_dev, CY_MAX_ID);
|
||||
input_mt_init_slots(input_dev, CY_MAX_ID, 0);
|
||||
|
||||
error = request_threaded_irq(ts->irq, NULL, cyttsp_irq,
|
||||
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
|
||||
|
@@ -778,7 +778,7 @@ static int __devinit edt_ft5x06_ts_probe(struct i2c_client *client,
|
||||
0, tsdata->num_x * 64 - 1, 0, 0);
|
||||
input_set_abs_params(input, ABS_MT_POSITION_Y,
|
||||
0, tsdata->num_y * 64 - 1, 0, 0);
|
||||
error = input_mt_init_slots(input, MAX_SUPPORT_POINTS);
|
||||
error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, 0);
|
||||
if (error) {
|
||||
dev_err(&client->dev, "Unable to init MT slots.\n");
|
||||
goto err_free_mem;
|
||||
|
@@ -204,7 +204,7 @@ static int __devinit egalax_ts_probe(struct i2c_client *client,
|
||||
ABS_MT_POSITION_X, 0, EGALAX_MAX_X, 0, 0);
|
||||
input_set_abs_params(input_dev,
|
||||
ABS_MT_POSITION_X, 0, EGALAX_MAX_Y, 0, 0);
|
||||
input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS);
|
||||
input_mt_init_slots(input_dev, MAX_SUPPORT_POINTS, 0);
|
||||
|
||||
input_set_drvdata(input_dev, ts);
|
||||
|
||||
|
@@ -252,7 +252,7 @@ static int __devinit ili210x_i2c_probe(struct i2c_client *client,
|
||||
input_set_abs_params(input, ABS_Y, 0, ymax, 0, 0);
|
||||
|
||||
/* Multi touch */
|
||||
input_mt_init_slots(input, MAX_TOUCHES);
|
||||
input_mt_init_slots(input, MAX_TOUCHES, 0);
|
||||
input_set_abs_params(input, ABS_MT_POSITION_X, 0, xmax, 0, 0);
|
||||
input_set_abs_params(input, ABS_MT_POSITION_Y, 0, ymax, 0, 0);
|
||||
|
||||
|
@@ -404,7 +404,7 @@ static int __devinit mms114_probe(struct i2c_client *client,
|
||||
input_set_abs_params(input_dev, ABS_Y, 0, data->pdata->y_size, 0, 0);
|
||||
|
||||
/* For multi touch */
|
||||
input_mt_init_slots(input_dev, MMS114_MAX_TOUCH);
|
||||
input_mt_init_slots(input_dev, MMS114_MAX_TOUCH, 0);
|
||||
input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
|
||||
0, MMS114_MAX_AREA, 0, 0);
|
||||
input_set_abs_params(input_dev, ABS_MT_POSITION_X,
|
||||
|
@@ -264,7 +264,7 @@ static int pm_connect(struct serio *serio, struct serio_driver *drv)
|
||||
input_set_abs_params(pm->dev, ABS_Y, 0, max_y, 0, 0);
|
||||
|
||||
if (pm->maxcontacts > 1) {
|
||||
input_mt_init_slots(pm->dev, pm->maxcontacts);
|
||||
input_mt_init_slots(pm->dev, pm->maxcontacts, 0);
|
||||
input_set_abs_params(pm->dev,
|
||||
ABS_MT_POSITION_X, 0, max_x, 0, 0);
|
||||
input_set_abs_params(pm->dev,
|
||||
|
@@ -471,7 +471,7 @@ static int w8001_setup(struct w8001 *w8001)
|
||||
case 5:
|
||||
w8001->pktlen = W8001_PKTLEN_TOUCH2FG;
|
||||
|
||||
input_mt_init_slots(dev, 2);
|
||||
input_mt_init_slots(dev, 2, 0);
|
||||
input_set_abs_params(dev, ABS_MT_POSITION_X,
|
||||
0, touch.x, 0, 0);
|
||||
input_set_abs_params(dev, ABS_MT_POSITION_Y,
|
||||
|
Reference in New Issue
Block a user