.. | .. |
---|
454 | 454 | data->client = client; |
---|
455 | 455 | data->input_dev = input_dev; |
---|
456 | 456 | |
---|
457 | | - /* FIXME: switch to device_get_match_data() when available */ |
---|
458 | | - match_data = of_device_get_match_data(&client->dev); |
---|
| 457 | + match_data = device_get_match_data(&client->dev); |
---|
459 | 458 | if (!match_data) |
---|
460 | 459 | return -EINVAL; |
---|
461 | 460 | |
---|
.. | .. |
---|
558 | 557 | /* Release all touch */ |
---|
559 | 558 | for (id = 0; id < MMS114_MAX_TOUCH; id++) { |
---|
560 | 559 | input_mt_slot(input_dev, id); |
---|
561 | | - input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, false); |
---|
| 560 | + input_mt_report_slot_inactive(input_dev); |
---|
562 | 561 | } |
---|
563 | 562 | |
---|
564 | 563 | input_mt_report_pointer_emulation(input_dev, true); |
---|