aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorLuis Ortega <luiorpe1@upv.es>2014-01-27 15:27:35 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-28 01:35:16 -0500
commitad697b96e67dc34ef69e3358c331c69dcd283c0d (patch)
treef97db3459a5121e9dd3aaece7f5922a454c2700c /drivers/input/touchscreen
parentdeb4981985ff2626a449cdeff2beaeb21986cfce (diff)
Input: zforce - fix lines exceeding 80 columns
Fixed lines exceeding 80 characters long wherever possible, as per the coding style. Signed-off-by: Luis Ortega <luiorpe1@upv.es> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/zforce_ts.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 9ce551fea97b..e87888c229ab 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -235,7 +235,8 @@ static int zforce_scan_frequency(struct zforce_ts *ts, u16 idle, u16 finger,
235 (finger & 0xff), ((finger >> 8) & 0xff), 235 (finger & 0xff), ((finger >> 8) & 0xff),
236 (stylus & 0xff), ((stylus >> 8) & 0xff) }; 236 (stylus & 0xff), ((stylus >> 8) & 0xff) };
237 237
238 dev_dbg(&client->dev, "set scan frequency to (idle: %d, finger: %d, stylus: %d)\n", 238 dev_dbg(&client->dev,
239 "set scan frequency to (idle: %d, finger: %d, stylus: %d)\n",
239 idle, finger, stylus); 240 idle, finger, stylus);
240 241
241 return zforce_send_wait(ts, &buf[0], ARRAY_SIZE(buf)); 242 return zforce_send_wait(ts, &buf[0], ARRAY_SIZE(buf));
@@ -332,7 +333,8 @@ static int zforce_touch_event(struct zforce_ts *ts, u8 *payload)
332 333
333 count = payload[0]; 334 count = payload[0];
334 if (count > ZFORCE_REPORT_POINTS) { 335 if (count > ZFORCE_REPORT_POINTS) {
335 dev_warn(&client->dev, "too many coordinates %d, expected max %d\n", 336 dev_warn(&client->dev,
337 "too many coordinates %d, expected max %d\n",
336 count, ZFORCE_REPORT_POINTS); 338 count, ZFORCE_REPORT_POINTS);
337 count = ZFORCE_REPORT_POINTS; 339 count = ZFORCE_REPORT_POINTS;
338 } 340 }
@@ -485,8 +487,8 @@ static irqreturn_t zforce_interrupt(int irq, void *dev_id)
485 while (!gpio_get_value(pdata->gpio_int)) { 487 while (!gpio_get_value(pdata->gpio_int)) {
486 ret = zforce_read_packet(ts, payload_buffer); 488 ret = zforce_read_packet(ts, payload_buffer);
487 if (ret < 0) { 489 if (ret < 0) {
488 dev_err(&client->dev, "could not read packet, ret: %d\n", 490 dev_err(&client->dev,
489 ret); 491 "could not read packet, ret: %d\n", ret);
490 break; 492 break;
491 } 493 }
492 494
@@ -530,7 +532,8 @@ static irqreturn_t zforce_interrupt(int irq, void *dev_id)
530 payload[RESPONSE_DATA + 4]; 532 payload[RESPONSE_DATA + 4];
531 ts->version_rev = (payload[RESPONSE_DATA + 7] << 8) | 533 ts->version_rev = (payload[RESPONSE_DATA + 7] << 8) |
532 payload[RESPONSE_DATA + 6]; 534 payload[RESPONSE_DATA + 6];
533 dev_dbg(&ts->client->dev, "Firmware Version %04x:%04x %04x:%04x\n", 535 dev_dbg(&ts->client->dev,
536 "Firmware Version %04x:%04x %04x:%04x\n",
534 ts->version_major, ts->version_minor, 537 ts->version_major, ts->version_minor,
535 ts->version_build, ts->version_rev); 538 ts->version_build, ts->version_rev);
536 539
@@ -543,7 +546,8 @@ static irqreturn_t zforce_interrupt(int irq, void *dev_id)
543 break; 546 break;
544 547
545 default: 548 default:
546 dev_err(&ts->client->dev, "unrecognized response id: 0x%x\n", 549 dev_err(&ts->client->dev,
550 "unrecognized response id: 0x%x\n",
547 payload[RESPONSE_ID]); 551 payload[RESPONSE_ID]);
548 break; 552 break;
549 } 553 }
@@ -609,7 +613,8 @@ static int zforce_suspend(struct device *dev)
609 613
610 enable_irq_wake(client->irq); 614 enable_irq_wake(client->irq);
611 } else if (input->users) { 615 } else if (input->users) {
612 dev_dbg(&client->dev, "suspend without being a wakeup source\n"); 616 dev_dbg(&client->dev,
617 "suspend without being a wakeup source\n");
613 618
614 ret = zforce_stop(ts); 619 ret = zforce_stop(ts);
615 if (ret) 620 if (ret)