aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ipaq-micro.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/ipaq-micro.c')
-rw-r--r--drivers/mfd/ipaq-micro.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
index 7e50fe0118e3..8df3266064e4 100644
--- a/drivers/mfd/ipaq-micro.c
+++ b/drivers/mfd/ipaq-micro.c
@@ -115,7 +115,7 @@ static void micro_rx_msg(struct ipaq_micro *micro, u8 id, int len, u8 *data)
115 } else { 115 } else {
116 dev_err(micro->dev, 116 dev_err(micro->dev,
117 "out of band RX message 0x%02x\n", id); 117 "out of band RX message 0x%02x\n", id);
118 if(!micro->msg) 118 if (!micro->msg)
119 dev_info(micro->dev, "no message queued\n"); 119 dev_info(micro->dev, "no message queued\n");
120 else 120 else
121 dev_info(micro->dev, "expected message %02x\n", 121 dev_info(micro->dev, "expected message %02x\n",
@@ -126,13 +126,13 @@ static void micro_rx_msg(struct ipaq_micro *micro, u8 id, int len, u8 *data)
126 if (micro->key) 126 if (micro->key)
127 micro->key(micro->key_data, len, data); 127 micro->key(micro->key_data, len, data);
128 else 128 else
129 dev_dbg(micro->dev, "key message ignored, no handle \n"); 129 dev_dbg(micro->dev, "key message ignored, no handle\n");
130 break; 130 break;
131 case MSG_TOUCHSCREEN: 131 case MSG_TOUCHSCREEN:
132 if (micro->ts) 132 if (micro->ts)
133 micro->ts(micro->ts_data, len, data); 133 micro->ts(micro->ts_data, len, data);
134 else 134 else
135 dev_dbg(micro->dev, "touchscreen message ignored, no handle \n"); 135 dev_dbg(micro->dev, "touchscreen message ignored, no handle\n");
136 break; 136 break;
137 default: 137 default:
138 dev_err(micro->dev, 138 dev_err(micro->dev,
@@ -154,7 +154,7 @@ static void micro_process_char(struct ipaq_micro *micro, u8 ch)
154 rx->state = STATE_ID; /* Next byte is the id and len */ 154 rx->state = STATE_ID; /* Next byte is the id and len */
155 break; 155 break;
156 case STATE_ID: /* Looking for id and len byte */ 156 case STATE_ID: /* Looking for id and len byte */
157 rx->id = (ch & 0xf0) >> 4 ; 157 rx->id = (ch & 0xf0) >> 4;
158 rx->len = (ch & 0x0f); 158 rx->len = (ch & 0x0f);
159 rx->index = 0; 159 rx->index = 0;
160 rx->chksum = ch; 160 rx->chksum = ch;