evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: elo - switch to using dev_xxx() when printing messages

Browse source 
Also fix formatting of "switch" statements.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2010-01-06 23:52:12 -08:00
parent a9a1f9c315
commit 8cab9ba104
1 changed files with 121 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/input/touchscreen/elo.c
View file

@ -72,11 +72,13 @@ static void elo_process_data_10(struct elo *elo, unsigned char data)
struct input_dev *dev = elo->dev; struct input_dev *dev = elo->dev;
elo->data[elo->idx] = data; elo->data[elo->idx] = data;
switch (elo->idx++) { switch (elo->idx++) {
case 0: case 0:
elo->csum = 0xaa; elo->csum = 0xaa;
if (data != ELO10_LEAD_BYTE) { if (data != ELO10_LEAD_BYTE) {
pr_debug("elo: unsynchronized data: 0x%02x\n", data); dev_dbg(&elo->serio->dev,
"unsynchronized data: 0x%02x\n", data);
elo->idx = 0; elo->idx = 0;
} }
break; break;
@ -84,13 +86,15 @@ static void elo_process_data_10(struct elo *elo, unsigned char data)
case 9: case 9:
elo->idx = 0; elo->idx = 0;
if (data != elo->csum) { if (data != elo->csum) {
pr_debug("elo: bad checksum: 0x%02x, expected 0x%02x\n", dev_dbg(&elo->serio->dev,
"bad checksum: 0x%02x, expected 0x%02x\n",
data, elo->csum); data, elo->csum);
break; break;
} }
if (elo->data[1] != elo->expected_packet) { if (elo->data[1] != elo->expected_packet) {
if (elo->data[1] != ELO10_TOUCH_PACKET) if (elo->data[1] != ELO10_TOUCH_PACKET)
pr_debug("elo: unexpected packet: 0x%02x\n", dev_dbg(&elo->serio->dev,
"unexpected packet: 0x%02x\n",
elo->data[1]); elo->data[1]);
break; break;
} }
@ -123,9 +127,20 @@ static void elo_process_data_6(struct elo *elo, unsigned char data)
switch (elo->idx++) { switch (elo->idx++) {
case 0: if ((data & 0xc0) != 0xc0) elo->idx = 0; break; case 0:
case 1: if ((data & 0xc0) != 0x80) elo->idx = 0; break; if ((data & 0xc0) != 0xc0)
case 2: if ((data & 0xc0) != 0x40) elo->idx = 0; break; elo->idx = 0;
break;
case 1:
if ((data & 0xc0) != 0x80)
elo->idx = 0;
break;
case 2:
if ((data & 0xc0) != 0x40)
elo->idx = 0;
break;
case 3: case 3:
if (data & 0xc0) { if (data & 0xc0) {
@ -189,7 +204,7 @@ static irqreturn_t elo_interrupt(struct serio *serio,
{ {
struct elo *elo = serio_get_drvdata(serio); struct elo *elo = serio_get_drvdata(serio);
switch(elo->id) { switch (elo->id) {
case 0: case 0:
elo_process_data_10(elo, data); elo_process_data_10(elo, data);
break; break;
@ -261,8 +276,8 @@ static int elo_setup_10(struct elo *elo)
if (packet[3] & ELO10_PRESSURE) if (packet[3] & ELO10_PRESSURE)
input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0); input_set_abs_params(dev, ABS_PRESSURE, 0, 255, 0, 0);
printk(KERN_INFO "elo: %sTouch touchscreen, fw: %02x.%02x, " dev_info(&elo->serio->dev,
"features: 0x%02x, controller: 0x%02x\n", "%sTouch touchscreen, fw: %02x.%02x, features: 0x%02x, controller: 0x%02x\n",
elo_types[(packet[1] -'0') & 0x03], elo_types[(packet[1] -'0') & 0x03],
packet[5], packet[4], packet[3], packet[7]); packet[5], packet[4], packet[3], packet[7]);