diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-04-15 14:05:54 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-25 12:47:35 -0400 |
commit | 22381288ba7fcb4d84cfba828dbca71c60d4ef79 (patch) | |
tree | 57d0430db401de8f489ad3e10547315f2c5c7326 | |
parent | 02a71600df7805d80e4269684a75a0efc689657d (diff) |
Input: tps6507x-ts - remove vref from platform data
Although defined in platform data, vref is not used anywhere.
Also remove model, irq, and clear_penirq as they are not used either.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/touchscreen/tps6507x-ts.c | 5 | ||||
-rw-r--r-- | include/linux/input/tps6507x-ts.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c index c981ccf8cf15..d3c2967f86fb 100644 --- a/drivers/input/touchscreen/tps6507x-ts.c +++ b/drivers/input/touchscreen/tps6507x-ts.c | |||
@@ -44,12 +44,8 @@ struct tps6507x_ts { | |||
44 | struct delayed_work work; | 44 | struct delayed_work work; |
45 | struct ts_event tc; | 45 | struct ts_event tc; |
46 | struct tps6507x_dev *mfd; | 46 | struct tps6507x_dev *mfd; |
47 | u16 model; | ||
48 | u16 min_pressure; | 47 | u16 min_pressure; |
49 | int irq; | ||
50 | void (*clear_penirq)(void); | ||
51 | unsigned long poll_period; /* ms */ | 48 | unsigned long poll_period; /* ms */ |
52 | int vref; /* non-zero to leave vref on */ | ||
53 | bool pendown; | 49 | bool pendown; |
54 | }; | 50 | }; |
55 | 51 | ||
@@ -291,7 +287,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev) | |||
291 | 287 | ||
292 | if (init_data) { | 288 | if (init_data) { |
293 | tsc->poll_period = init_data->poll_period; | 289 | tsc->poll_period = init_data->poll_period; |
294 | tsc->vref = init_data->vref; | ||
295 | tsc->min_pressure = init_data->min_pressure; | 290 | tsc->min_pressure = init_data->min_pressure; |
296 | input_dev->id.vendor = init_data->vendor; | 291 | input_dev->id.vendor = init_data->vendor; |
297 | input_dev->id.product = init_data->product; | 292 | input_dev->id.product = init_data->product; |
diff --git a/include/linux/input/tps6507x-ts.h b/include/linux/input/tps6507x-ts.h index ab1440313924..b433df801d92 100644 --- a/include/linux/input/tps6507x-ts.h +++ b/include/linux/input/tps6507x-ts.h | |||
@@ -14,7 +14,6 @@ | |||
14 | /* Board specific touch screen initial values */ | 14 | /* Board specific touch screen initial values */ |
15 | struct touchscreen_init_data { | 15 | struct touchscreen_init_data { |
16 | int poll_period; /* ms */ | 16 | int poll_period; /* ms */ |
17 | int vref; /* non-zero to leave vref on */ | ||
18 | __u16 min_pressure; /* min reading to be treated as a touch */ | 17 | __u16 min_pressure; /* min reading to be treated as a touch */ |
19 | __u16 vendor; | 18 | __u16 vendor; |
20 | __u16 product; | 19 | __u16 product; |