aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ir-kbd-i2c.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-11-17 12:20:52 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:50 -0500
commit52b661449aecc47e652a164c0d8078b31e10aca0 (patch)
tree42af14cf5b6df82b841ec4bf38f22da54fc4439b /drivers/media/video/ir-kbd-i2c.c
parent29e3ec19d5c88d534ced219d3962d67243e4d310 (diff)
[media] rc: Rename remote controller type to rc_type instead of ir_type
for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
-rw-r--r--drivers/media/video/ir-kbd-i2c.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index c77ea53f50d7..dd54c3dae054 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -269,7 +269,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
269{ 269{
270 char *ir_codes = NULL; 270 char *ir_codes = NULL;
271 const char *name = NULL; 271 const char *name = NULL;
272 u64 ir_type = IR_TYPE_UNKNOWN; 272 u64 rc_type = RC_TYPE_UNKNOWN;
273 struct IR_i2c *ir; 273 struct IR_i2c *ir;
274 struct rc_dev *rc = NULL; 274 struct rc_dev *rc = NULL;
275 struct i2c_adapter *adap = client->adapter; 275 struct i2c_adapter *adap = client->adapter;
@@ -288,7 +288,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
288 case 0x64: 288 case 0x64:
289 name = "Pixelview"; 289 name = "Pixelview";
290 ir->get_key = get_key_pixelview; 290 ir->get_key = get_key_pixelview;
291 ir_type = IR_TYPE_OTHER; 291 rc_type = RC_TYPE_OTHER;
292 ir_codes = RC_MAP_EMPTY; 292 ir_codes = RC_MAP_EMPTY;
293 break; 293 break;
294 case 0x18: 294 case 0x18:
@@ -296,7 +296,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
296 case 0x1a: 296 case 0x1a:
297 name = "Hauppauge"; 297 name = "Hauppauge";
298 ir->get_key = get_key_haup; 298 ir->get_key = get_key_haup;
299 ir_type = IR_TYPE_RC5; 299 rc_type = RC_TYPE_RC5;
300 if (hauppauge == 1) { 300 if (hauppauge == 1) {
301 ir_codes = RC_MAP_HAUPPAUGE_NEW; 301 ir_codes = RC_MAP_HAUPPAUGE_NEW;
302 } else { 302 } else {
@@ -306,19 +306,19 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
306 case 0x30: 306 case 0x30:
307 name = "KNC One"; 307 name = "KNC One";
308 ir->get_key = get_key_knc1; 308 ir->get_key = get_key_knc1;
309 ir_type = IR_TYPE_OTHER; 309 rc_type = RC_TYPE_OTHER;
310 ir_codes = RC_MAP_EMPTY; 310 ir_codes = RC_MAP_EMPTY;
311 break; 311 break;
312 case 0x6b: 312 case 0x6b:
313 name = "FusionHDTV"; 313 name = "FusionHDTV";
314 ir->get_key = get_key_fusionhdtv; 314 ir->get_key = get_key_fusionhdtv;
315 ir_type = IR_TYPE_RC5; 315 rc_type = RC_TYPE_RC5;
316 ir_codes = RC_MAP_FUSIONHDTV_MCE; 316 ir_codes = RC_MAP_FUSIONHDTV_MCE;
317 break; 317 break;
318 case 0x40: 318 case 0x40:
319 name = "AVerMedia Cardbus remote"; 319 name = "AVerMedia Cardbus remote";
320 ir->get_key = get_key_avermedia_cardbus; 320 ir->get_key = get_key_avermedia_cardbus;
321 ir_type = IR_TYPE_OTHER; 321 rc_type = RC_TYPE_OTHER;
322 ir_codes = RC_MAP_AVERMEDIA_CARDBUS; 322 ir_codes = RC_MAP_AVERMEDIA_CARDBUS;
323 break; 323 break;
324 } 324 }
@@ -333,7 +333,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
333 333
334 name = init_data->name; 334 name = init_data->name;
335 if (init_data->type) 335 if (init_data->type)
336 ir_type = init_data->type; 336 rc_type = init_data->type;
337 337
338 if (init_data->polling_interval) 338 if (init_data->polling_interval)
339 ir->polling_interval = init_data->polling_interval; 339 ir->polling_interval = init_data->polling_interval;
@@ -378,7 +378,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
378 ir->rc = rc; 378 ir->rc = rc;
379 379
380 /* Make sure we are all setup before going on */ 380 /* Make sure we are all setup before going on */
381 if (!name || !ir->get_key || !ir_type || !ir_codes) { 381 if (!name || !ir->get_key || !rc_type || !ir_codes) {
382 dprintk(1, ": Unsupported device at address 0x%02x\n", 382 dprintk(1, ": Unsupported device at address 0x%02x\n",
383 addr); 383 addr);
384 err = -ENODEV; 384 err = -ENODEV;
@@ -405,7 +405,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
405 * Initialize the other fields of rc_dev 405 * Initialize the other fields of rc_dev
406 */ 406 */
407 rc->map_name = ir->ir_codes; 407 rc->map_name = ir->ir_codes;
408 rc->allowed_protos = ir_type; 408 rc->allowed_protos = rc_type;
409 if (!rc->driver_name) 409 if (!rc->driver_name)
410 rc->driver_name = MODULE_NAME; 410 rc->driver_name = MODULE_NAME;
411 411