aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index b0facaa40b2f..12f1053137da 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -163,7 +163,7 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
163 163
164static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) 164static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
165{ 165{
166 unsigned char b; 166 unsigned char b;
167 167
168 /* poll IR chip */ 168 /* poll IR chip */
169 if (1 != i2c_master_recv(&ir->c,&b,1)) { 169 if (1 != i2c_master_recv(&ir->c,&b,1)) {
@@ -177,7 +177,7 @@ static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
177 177
178static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) 178static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
179{ 179{
180 unsigned char b; 180 unsigned char b;
181 181
182 /* poll IR chip */ 182 /* poll IR chip */
183 if (1 != i2c_master_recv(&ir->c,&b,1)) { 183 if (1 != i2c_master_recv(&ir->c,&b,1)) {
@@ -225,7 +225,7 @@ static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
225 225
226static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) 226static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
227{ 227{
228 unsigned char b; 228 unsigned char b;
229 229
230 /* poll IR chip */ 230 /* poll IR chip */
231 if (1 != i2c_master_recv(&ir->c,&b,1)) { 231 if (1 != i2c_master_recv(&ir->c,&b,1)) {
@@ -287,17 +287,17 @@ static int ir_detach(struct i2c_client *client);
287static int ir_probe(struct i2c_adapter *adap); 287static int ir_probe(struct i2c_adapter *adap);
288 288
289static struct i2c_driver driver = { 289static struct i2c_driver driver = {
290 .name = "ir remote kbd driver", 290 .name = "ir remote kbd driver",
291 .id = I2C_DRIVERID_EXP3, /* FIXME */ 291 .id = I2C_DRIVERID_EXP3, /* FIXME */
292 .flags = I2C_DF_NOTIFY, 292 .flags = I2C_DF_NOTIFY,
293 .attach_adapter = ir_probe, 293 .attach_adapter = ir_probe,
294 .detach_client = ir_detach, 294 .detach_client = ir_detach,
295}; 295};
296 296
297static struct i2c_client client_template = 297static struct i2c_client client_template =
298{ 298{
299 .name = "unset", 299 .name = "unset",
300 .driver = &driver 300 .driver = &driver
301}; 301};
302 302
303static int ir_attach(struct i2c_adapter *adap, int addr, 303static int ir_attach(struct i2c_adapter *adap, int addr,
@@ -398,7 +398,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
398 398
399static int ir_detach(struct i2c_client *client) 399static int ir_detach(struct i2c_client *client)
400{ 400{
401 struct IR_i2c *ir = i2c_get_clientdata(client); 401 struct IR_i2c *ir = i2c_get_clientdata(client);
402 402
403 /* kill outstanding polls */ 403 /* kill outstanding polls */
404 del_timer(&ir->timer); 404 del_timer(&ir->timer);