Commit 9b2b4cc0fff7e1091232f3db9dd0647f0c9b97d9
Committed by
Sekhar Nori
Sekhar Nori
1 parent
7c763f6a93
Exists in
ti-linux-3.14.y
and in
2 other branches
Input: edt-ft5x06 - several cleanups; no functional change
[ Upstream commit 1730d81460b929b1f217cb7d9cb193a7b0e58dd9 ] - remove redundant parens - remove redundant type casts - fix mixed tab/space indentation Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Acked-by: Fugang Duan <B38611@freescale.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Showing 1 changed file with 6 additions and 9 deletions Side-by-side Diff
drivers/input/touchscreen/edt-ft5x06.c
| ... | ... | @@ -173,7 +173,7 @@ |
| 173 | 173 | x = ((buf[0] << 8) | buf[1]) & 0x0fff; |
| 174 | 174 | y = ((buf[2] << 8) | buf[3]) & 0x0fff; |
| 175 | 175 | id = (buf[2] >> 4) & 0x0f; |
| 176 | - down = (type != TOUCH_EVENT_UP); | |
| 176 | + down = type != TOUCH_EVENT_UP; | |
| 177 | 177 | |
| 178 | 178 | input_mt_slot(tsdata->input, id); |
| 179 | 179 | input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER, down); |
| ... | ... | @@ -257,7 +257,7 @@ |
| 257 | 257 | struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); |
| 258 | 258 | struct edt_ft5x06_attribute *attr = |
| 259 | 259 | container_of(dattr, struct edt_ft5x06_attribute, dattr); |
| 260 | - u8 *field = (u8 *)((char *)tsdata + attr->field_offset); | |
| 260 | + u8 *field = (u8 *)tsdata + attr->field_offset; | |
| 261 | 261 | int val; |
| 262 | 262 | size_t count = 0; |
| 263 | 263 | int error = 0; |
| ... | ... | @@ -299,7 +299,7 @@ |
| 299 | 299 | struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client); |
| 300 | 300 | struct edt_ft5x06_attribute *attr = |
| 301 | 301 | container_of(dattr, struct edt_ft5x06_attribute, dattr); |
| 302 | - u8 *field = (u8 *)((char *)tsdata + attr->field_offset); | |
| 302 | + u8 *field = (u8 *)tsdata + attr->field_offset; | |
| 303 | 303 | unsigned int val; |
| 304 | 304 | int error; |
| 305 | 305 | |
| ... | ... | @@ -479,7 +479,7 @@ |
| 479 | 479 | |
| 480 | 480 | if (mode != tsdata->factory_mode) { |
| 481 | 481 | retval = mode ? edt_ft5x06_factory_mode(tsdata) : |
| 482 | - edt_ft5x06_work_mode(tsdata); | |
| 482 | + edt_ft5x06_work_mode(tsdata); | |
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | mutex_unlock(&tsdata->mutex); |
| ... | ... | @@ -568,7 +568,6 @@ |
| 568 | 568 | return error ?: read; |
| 569 | 569 | }; |
| 570 | 570 | |
| 571 | - | |
| 572 | 571 | static const struct file_operations debugfs_raw_data_fops = { |
| 573 | 572 | .open = simple_open, |
| 574 | 573 | .read = edt_ft5x06_debugfs_raw_data_read, |
| ... | ... | @@ -614,8 +613,6 @@ |
| 614 | 613 | |
| 615 | 614 | #endif /* CONFIG_DEBUGFS */ |
| 616 | 615 | |
| 617 | - | |
| 618 | - | |
| 619 | 616 | static int edt_ft5x06_ts_reset(struct i2c_client *client, |
| 620 | 617 | int reset_pin) |
| 621 | 618 | { |
| ... | ... | @@ -852,8 +849,8 @@ |
| 852 | 849 | edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); |
| 853 | 850 | |
| 854 | 851 | static const struct i2c_device_id edt_ft5x06_ts_id[] = { |
| 855 | - { "edt-ft5x06", 0 }, | |
| 856 | - { } | |
| 852 | + { "edt-ft5x06", 0, }, | |
| 853 | + { /* sentinel */ } | |
| 857 | 854 | }; |
| 858 | 855 | MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id); |
| 859 | 856 |