aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/ir-sharp-decoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/rc/ir-sharp-decoder.c')
-rw-r--r--drivers/media/rc/ir-sharp-decoder.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index df296991906c..6a38c50566a4 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -54,8 +54,8 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
54 return 0; 54 return 0;
55 } 55 }
56 56
57 IR_dprintk(2, "Sharp decode started at state %d (%uus %s)\n", 57 dev_dbg(&dev->dev, "Sharp decode started at state %d (%uus %s)\n",
58 data->state, TO_US(ev.duration), TO_STR(ev.pulse)); 58 data->state, TO_US(ev.duration), TO_STR(ev.pulse));
59 59
60 switch (data->state) { 60 switch (data->state) {
61 61
@@ -149,9 +149,9 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
149 msg = (data->bits >> 15) & 0x7fff; 149 msg = (data->bits >> 15) & 0x7fff;
150 echo = data->bits & 0x7fff; 150 echo = data->bits & 0x7fff;
151 if ((msg ^ echo) != 0x3ff) { 151 if ((msg ^ echo) != 0x3ff) {
152 IR_dprintk(1, 152 dev_dbg(&dev->dev,
153 "Sharp checksum error: received 0x%04x, 0x%04x\n", 153 "Sharp checksum error: received 0x%04x, 0x%04x\n",
154 msg, echo); 154 msg, echo);
155 break; 155 break;
156 } 156 }
157 157
@@ -159,16 +159,15 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
159 command = bitrev8((msg >> 2) & 0xff); 159 command = bitrev8((msg >> 2) & 0xff);
160 160
161 scancode = address << 8 | command; 161 scancode = address << 8 | command;
162 IR_dprintk(1, "Sharp scancode 0x%04x\n", scancode); 162 dev_dbg(&dev->dev, "Sharp scancode 0x%04x\n", scancode);
163 163
164 rc_keydown(dev, RC_PROTO_SHARP, scancode, 0); 164 rc_keydown(dev, RC_PROTO_SHARP, scancode, 0);
165 data->state = STATE_INACTIVE; 165 data->state = STATE_INACTIVE;
166 return 0; 166 return 0;
167 } 167 }
168 168
169 IR_dprintk(1, "Sharp decode failed at count %d state %d (%uus %s)\n", 169 dev_dbg(&dev->dev, "Sharp decode failed at count %d state %d (%uus %s)\n",
170 data->count, data->state, TO_US(ev.duration), 170 data->count, data->state, TO_US(ev.duration), TO_STR(ev.pulse));
171 TO_STR(ev.pulse));
172 data->state = STATE_INACTIVE; 171 data->state = STATE_INACTIVE;
173 return -EINVAL; 172 return -EINVAL;
174} 173}