diff options
author | Aapo Tahkola <aet@rasterburn.org> | 2007-03-26 15:59:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-09 09:13:01 -0400 |
commit | bf2b4f67a48043f3446075b02c1d0fbe07c80819 (patch) | |
tree | d30f0a1339f682f91a84ba0d2018049dc5ac2718 /drivers/media | |
parent | e7b419b69212f3c3489ae808f26d2a0d2b52fe9c (diff) |
V4L/DVB (5611): M920x: replace deb_rc with deb
deb_rc is used by the dvb-usb core framework. This patch replaces all
occurances of deb_rc with deb, in m920x.c, so that its clear that we're
not using dvb-usb's deb_rc.
Signed-off-by: Aapo Tahkola <aet@rasterburn.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-usb/m920x.c | 41 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/m920x.h | 2 |
2 files changed, 21 insertions, 22 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c index f9fb791102b..7433d352724 100644 --- a/drivers/media/dvb/dvb-usb/m920x.c +++ b/drivers/media/dvb/dvb-usb/m920x.c | |||
@@ -36,7 +36,7 @@ static inline int m9206_read(struct usb_device *udev, u8 request, u16 value, | |||
36 | } | 36 | } |
37 | 37 | ||
38 | if (ret != size) { | 38 | if (ret != size) { |
39 | deb_rc("m920x_read = no data\n"); | 39 | deb("m920x_read = no data\n"); |
40 | return -EIO; | 40 | return -EIO; |
41 | } | 41 | } |
42 | 42 | ||
@@ -61,19 +61,19 @@ static int m9206_init(struct dvb_usb_device *d, struct m9206_inits *rc_seq) | |||
61 | 61 | ||
62 | /* Remote controller init. */ | 62 | /* Remote controller init. */ |
63 | if (d->props.rc_query) { | 63 | if (d->props.rc_query) { |
64 | deb_rc("Initialising remote control\n"); | 64 | deb("Initialising remote control\n"); |
65 | while (rc_seq->address) { | 65 | while (rc_seq->address) { |
66 | if ((ret = m9206_write(d->udev, M9206_CORE, | 66 | if ((ret = m9206_write(d->udev, M9206_CORE, |
67 | rc_seq->data, | 67 | rc_seq->data, |
68 | rc_seq->address)) != 0) { | 68 | rc_seq->address)) != 0) { |
69 | deb_rc("Initialising remote control failed\n"); | 69 | deb("Initialising remote control failed\n"); |
70 | return ret; | 70 | return ret; |
71 | } | 71 | } |
72 | 72 | ||
73 | rc_seq++; | 73 | rc_seq++; |
74 | } | 74 | } |
75 | 75 | ||
76 | deb_rc("Initialising remote control success\n"); | 76 | deb("Initialising remote control success\n"); |
77 | } | 77 | } |
78 | 78 | ||
79 | return ret; | 79 | return ret; |
@@ -125,15 +125,14 @@ static int m9206_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
125 | goto unlock; | 125 | goto unlock; |
126 | 126 | ||
127 | default: | 127 | default: |
128 | deb_rc("Unexpected rc state %02x\n", | 128 | deb("Unexpected rc state %02x\n", rc_state[0]); |
129 | rc_state[0]); | ||
130 | *state = REMOTE_NO_KEY_PRESSED; | 129 | *state = REMOTE_NO_KEY_PRESSED; |
131 | goto unlock; | 130 | goto unlock; |
132 | } | 131 | } |
133 | } | 132 | } |
134 | 133 | ||
135 | if (rc_state[1] != 0) | 134 | if (rc_state[1] != 0) |
136 | deb_rc("Unknown rc key %02x\n", rc_state[1]); | 135 | deb("Unknown rc key %02x\n", rc_state[1]); |
137 | 136 | ||
138 | *state = REMOTE_NO_KEY_PRESSED; | 137 | *state = REMOTE_NO_KEY_PRESSED; |
139 | 138 | ||
@@ -313,11 +312,11 @@ static int m9206_firmware_download(struct usb_device *udev, | |||
313 | 312 | ||
314 | if ((ret = m9206_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0) | 313 | if ((ret = m9206_read(udev, M9206_FILTER, 0x0, 0x8000, read, 4)) != 0) |
315 | goto done; | 314 | goto done; |
316 | deb_rc("%x %x %x %x\n", read[0], read[1], read[2], read[3]); | 315 | deb("%x %x %x %x\n", read[0], read[1], read[2], read[3]); |
317 | 316 | ||
318 | if ((ret = m9206_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0) | 317 | if ((ret = m9206_read(udev, M9206_FW, 0x0, 0x0, read, 1)) != 0) |
319 | goto done; | 318 | goto done; |
320 | deb_rc("%x\n", read[0]); | 319 | deb("%x\n", read[0]); |
321 | 320 | ||
322 | for (pass = 0; pass < 2; pass++) { | 321 | for (pass = 0; pass < 2; pass++) { |
323 | for (i = 0; i + (sizeof(u16) * 3) < fw->size;) { | 322 | for (i = 0; i + (sizeof(u16) * 3) < fw->size;) { |
@@ -339,7 +338,7 @@ static int m9206_firmware_download(struct usb_device *udev, | |||
339 | USB_TYPE_VENDOR | USB_DIR_OUT, | 338 | USB_TYPE_VENDOR | USB_DIR_OUT, |
340 | value, index, buff, size, 20); | 339 | value, index, buff, size, 20); |
341 | if (ret != size) { | 340 | if (ret != size) { |
342 | deb_rc("error while uploading fw!\n"); | 341 | deb("error while uploading fw!\n"); |
343 | ret = -EIO; | 342 | ret = -EIO; |
344 | goto done; | 343 | goto done; |
345 | } | 344 | } |
@@ -348,7 +347,7 @@ static int m9206_firmware_download(struct usb_device *udev, | |||
348 | i += size; | 347 | i += size; |
349 | } | 348 | } |
350 | if (i != fw->size) { | 349 | if (i != fw->size) { |
351 | deb_rc("bad firmware file!\n"); | 350 | deb("bad firmware file!\n"); |
352 | ret = -EINVAL; | 351 | ret = -EINVAL; |
353 | goto done; | 352 | goto done; |
354 | } | 353 | } |
@@ -358,7 +357,7 @@ static int m9206_firmware_download(struct usb_device *udev, | |||
358 | 357 | ||
359 | /* m9206 will disconnect itself from the bus after this. */ | 358 | /* m9206 will disconnect itself from the bus after this. */ |
360 | (void) m9206_write(udev, M9206_CORE, 0x01, M9206_FW_GO); | 359 | (void) m9206_write(udev, M9206_CORE, 0x01, M9206_FW_GO); |
361 | deb_rc("firmware uploaded!\n"); | 360 | deb("firmware uploaded!\n"); |
362 | 361 | ||
363 | done: | 362 | done: |
364 | kfree(buff); | 363 | kfree(buff); |
@@ -401,7 +400,7 @@ static int m920x_mt352_demod_init(struct dvb_frontend *fe) | |||
401 | mt352_write(fe, unk1, ARRAY_SIZE(unk1)); | 400 | mt352_write(fe, unk1, ARRAY_SIZE(unk1)); |
402 | mt352_write(fe, unk2, ARRAY_SIZE(unk2)); | 401 | mt352_write(fe, unk2, ARRAY_SIZE(unk2)); |
403 | 402 | ||
404 | deb_rc("Demod init!\n"); | 403 | deb("Demod init!\n"); |
405 | 404 | ||
406 | return 0; | 405 | return 0; |
407 | } | 406 | } |
@@ -444,7 +443,7 @@ static struct qt1010_config m920x_qt1010_config = { | |||
444 | /* Callbacks for DVB USB */ | 443 | /* Callbacks for DVB USB */ |
445 | static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap) | 444 | static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap) |
446 | { | 445 | { |
447 | deb_rc("%s\n",__FUNCTION__); | 446 | deb("%s\n",__FUNCTION__); |
448 | 447 | ||
449 | if ((adap->fe = dvb_attach(mt352_attach, &m920x_mt352_config, | 448 | if ((adap->fe = dvb_attach(mt352_attach, &m920x_mt352_config, |
450 | &adap->dev->i2c_adap)) == NULL) | 449 | &adap->dev->i2c_adap)) == NULL) |
@@ -455,7 +454,7 @@ static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap) | |||
455 | 454 | ||
456 | static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap) | 455 | static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap) |
457 | { | 456 | { |
458 | deb_rc("%s\n",__FUNCTION__); | 457 | deb("%s\n",__FUNCTION__); |
459 | 458 | ||
460 | if ((adap->fe = dvb_attach(tda10046_attach, | 459 | if ((adap->fe = dvb_attach(tda10046_attach, |
461 | &m920x_tda10046_08_config, | 460 | &m920x_tda10046_08_config, |
@@ -467,7 +466,7 @@ static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap) | |||
467 | 466 | ||
468 | static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap) | 467 | static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap) |
469 | { | 468 | { |
470 | deb_rc("%s\n",__FUNCTION__); | 469 | deb("%s\n",__FUNCTION__); |
471 | 470 | ||
472 | if ((adap->fe = dvb_attach(tda10046_attach, | 471 | if ((adap->fe = dvb_attach(tda10046_attach, |
473 | &m920x_tda10046_0b_config, | 472 | &m920x_tda10046_0b_config, |
@@ -479,7 +478,7 @@ static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap) | |||
479 | 478 | ||
480 | static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap) | 479 | static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap) |
481 | { | 480 | { |
482 | deb_rc("%s\n",__FUNCTION__); | 481 | deb("%s\n",__FUNCTION__); |
483 | 482 | ||
484 | if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, | 483 | if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, |
485 | &m920x_qt1010_config) == NULL) | 484 | &m920x_qt1010_config) == NULL) |
@@ -490,7 +489,7 @@ static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap) | |||
490 | 489 | ||
491 | static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap) | 490 | static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap) |
492 | { | 491 | { |
493 | deb_rc("%s\n",__FUNCTION__); | 492 | deb("%s\n",__FUNCTION__); |
494 | 493 | ||
495 | if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, | 494 | if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, |
496 | NULL) == NULL) | 495 | NULL) == NULL) |
@@ -501,7 +500,7 @@ static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap) | |||
501 | 500 | ||
502 | static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap) | 501 | static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap) |
503 | { | 502 | { |
504 | deb_rc("%s\n",__FUNCTION__); | 503 | deb("%s\n",__FUNCTION__); |
505 | 504 | ||
506 | if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, | 505 | if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, |
507 | NULL) == NULL) | 506 | NULL) == NULL) |
@@ -581,7 +580,7 @@ static int m920x_probe(struct usb_interface *intf, | |||
581 | struct m9206_inits *rc_init_seq = NULL; | 580 | struct m9206_inits *rc_init_seq = NULL; |
582 | int bInterfaceNumber = intf->cur_altsetting->desc.bInterfaceNumber; | 581 | int bInterfaceNumber = intf->cur_altsetting->desc.bInterfaceNumber; |
583 | 582 | ||
584 | deb_rc("Probing for m920x device at interface %d\n", bInterfaceNumber); | 583 | deb("Probing for m920x device at interface %d\n", bInterfaceNumber); |
585 | 584 | ||
586 | if (bInterfaceNumber == 0) { | 585 | if (bInterfaceNumber == 0) { |
587 | /* Single-tuner device, or first interface on | 586 | /* Single-tuner device, or first interface on |
@@ -629,7 +628,7 @@ static int m920x_probe(struct usb_interface *intf, | |||
629 | found: | 628 | found: |
630 | alt = usb_altnum_to_altsetting(intf, 1); | 629 | alt = usb_altnum_to_altsetting(intf, 1); |
631 | if (alt == NULL) { | 630 | if (alt == NULL) { |
632 | deb_rc("No alt found!\n"); | 631 | deb("No alt found!\n"); |
633 | return -ENODEV; | 632 | return -ENODEV; |
634 | } | 633 | } |
635 | 634 | ||
diff --git a/drivers/media/dvb/dvb-usb/m920x.h b/drivers/media/dvb/dvb-usb/m920x.h index a2a97558896..703a6d6950d 100644 --- a/drivers/media/dvb/dvb-usb/m920x.h +++ b/drivers/media/dvb/dvb-usb/m920x.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #define DVB_USB_LOG_PREFIX "m920x" | 4 | #define DVB_USB_LOG_PREFIX "m920x" |
5 | #include "dvb-usb.h" | 5 | #include "dvb-usb.h" |
6 | 6 | ||
7 | #define deb_rc(args...) dprintk(dvb_usb_m920x_debug,0x01,args) | 7 | #define deb(args...) dprintk(dvb_usb_m920x_debug,0x01,args) |
8 | 8 | ||
9 | #define M9206_CORE 0x22 | 9 | #define M9206_CORE 0x22 |
10 | #define M9206_RC_STATE 0xff51 | 10 | #define M9206_RC_STATE 0xff51 |