Commit 8df379c5a425d127216195861b88f981530e7581
Committed by
Mauro Carvalho Chehab
1 parent
0a73f2d61c
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
[media] af9013: use Kernel dev_foo() logging
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Showing 3 changed files with 89 additions and 81 deletions Side-by-side Diff
drivers/media/dvb-frontends/af9013.c
... | ... | @@ -24,10 +24,6 @@ |
24 | 24 | |
25 | 25 | #include "af9013_priv.h" |
26 | 26 | |
27 | -int af9013_debug; | |
28 | -module_param_named(debug, af9013_debug, int, 0644); | |
29 | -MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); | |
30 | - | |
31 | 27 | struct af9013_state { |
32 | 28 | struct i2c_adapter *i2c; |
33 | 29 | struct dvb_frontend fe; |
... | ... | @@ -73,7 +69,8 @@ |
73 | 69 | if (ret == 1) { |
74 | 70 | ret = 0; |
75 | 71 | } else { |
76 | - warn("i2c wr failed=%d reg=%04x len=%d", ret, reg, len); | |
72 | + dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d reg=%04x " \ | |
73 | + "len=%d\n", KBUILD_MODNAME, ret, reg, len); | |
77 | 74 | ret = -EREMOTEIO; |
78 | 75 | } |
79 | 76 | return ret; |
... | ... | @@ -107,7 +104,8 @@ |
107 | 104 | if (ret == 2) { |
108 | 105 | ret = 0; |
109 | 106 | } else { |
110 | - warn("i2c rd failed=%d reg=%04x len=%d", ret, reg, len); | |
107 | + dev_warn(&priv->i2c->dev, "%s: i2c rd failed=%d reg=%04x " \ | |
108 | + "len=%d\n", KBUILD_MODNAME, ret, reg, len); | |
111 | 109 | ret = -EREMOTEIO; |
112 | 110 | } |
113 | 111 | return ret; |
... | ... | @@ -220,7 +218,8 @@ |
220 | 218 | u8 pos; |
221 | 219 | u16 addr; |
222 | 220 | |
223 | - dbg("%s: gpio=%d gpioval=%02x", __func__, gpio, gpioval); | |
221 | + dev_dbg(&state->i2c->dev, "%s: gpio=%d gpioval=%02x\n", | |
222 | + __func__, gpio, gpioval); | |
224 | 223 | |
225 | 224 | /* |
226 | 225 | * GPIO0 & GPIO1 0xd735 |
... | ... | @@ -238,7 +237,8 @@ |
238 | 237 | break; |
239 | 238 | |
240 | 239 | default: |
241 | - err("invalid gpio:%d\n", gpio); | |
240 | + dev_err(&state->i2c->dev, "%s: invalid gpio=%d\n", | |
241 | + KBUILD_MODNAME, gpio); | |
242 | 242 | ret = -EINVAL; |
243 | 243 | goto err; |
244 | 244 | }; |
245 | 245 | |
246 | 246 | |
... | ... | @@ -261,15 +261,15 @@ |
261 | 261 | |
262 | 262 | return ret; |
263 | 263 | err: |
264 | - dbg("%s: failed=%d", __func__, ret); | |
264 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
265 | 265 | return ret; |
266 | 266 | } |
267 | 267 | |
268 | -static u32 af913_div(u32 a, u32 b, u32 x) | |
268 | +static u32 af9013_div(struct af9013_state *state, u32 a, u32 b, u32 x) | |
269 | 269 | { |
270 | 270 | u32 r = 0, c = 0, i; |
271 | 271 | |
272 | - dbg("%s: a=%d b=%d x=%d", __func__, a, b, x); | |
272 | + dev_dbg(&state->i2c->dev, "%s: a=%d b=%d x=%d\n", __func__, a, b, x); | |
273 | 273 | |
274 | 274 | if (a > b) { |
275 | 275 | c = a / b; |
... | ... | @@ -286,7 +286,9 @@ |
286 | 286 | } |
287 | 287 | r = (c << (u32)x) + r; |
288 | 288 | |
289 | - dbg("%s: a=%d b=%d x=%d r=%x", __func__, a, b, x, r); | |
289 | + dev_dbg(&state->i2c->dev, "%s: a=%d b=%d x=%d r=%d r=%x\n", | |
290 | + __func__, a, b, x, r, r); | |
291 | + | |
290 | 292 | return r; |
291 | 293 | } |
292 | 294 | |
... | ... | @@ -295,7 +297,7 @@ |
295 | 297 | int ret, i; |
296 | 298 | u8 tmp; |
297 | 299 | |
298 | - dbg("%s: onoff=%d", __func__, onoff); | |
300 | + dev_dbg(&state->i2c->dev, "%s: onoff=%d\n", __func__, onoff); | |
299 | 301 | |
300 | 302 | /* enable reset */ |
301 | 303 | ret = af9013_wr_reg_bits(state, 0xd417, 4, 1, 1); |
... | ... | @@ -340,7 +342,7 @@ |
340 | 342 | |
341 | 343 | return ret; |
342 | 344 | err: |
343 | - dbg("%s: failed=%d", __func__, ret); | |
345 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
344 | 346 | return ret; |
345 | 347 | } |
346 | 348 | |
... | ... | @@ -349,7 +351,7 @@ |
349 | 351 | struct af9013_state *state = fe->demodulator_priv; |
350 | 352 | int ret; |
351 | 353 | |
352 | - dbg("%s", __func__); | |
354 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
353 | 355 | |
354 | 356 | /* reset and start BER counter */ |
355 | 357 | ret = af9013_wr_reg_bits(state, 0xd391, 4, 1, 1); |
... | ... | @@ -358,7 +360,7 @@ |
358 | 360 | |
359 | 361 | return ret; |
360 | 362 | err: |
361 | - dbg("%s: failed=%d", __func__, ret); | |
363 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
362 | 364 | return ret; |
363 | 365 | } |
364 | 366 | |
... | ... | @@ -368,7 +370,7 @@ |
368 | 370 | int ret; |
369 | 371 | u8 buf[5]; |
370 | 372 | |
371 | - dbg("%s", __func__); | |
373 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
372 | 374 | |
373 | 375 | /* check if error bit count is ready */ |
374 | 376 | ret = af9013_rd_reg_bits(state, 0xd391, 4, 1, &buf[0]); |
... | ... | @@ -376,7 +378,7 @@ |
376 | 378 | goto err; |
377 | 379 | |
378 | 380 | if (!buf[0]) { |
379 | - dbg("%s: not ready", __func__); | |
381 | + dev_dbg(&state->i2c->dev, "%s: not ready\n", __func__); | |
380 | 382 | return 0; |
381 | 383 | } |
382 | 384 | |
... | ... | @@ -389,7 +391,7 @@ |
389 | 391 | |
390 | 392 | return ret; |
391 | 393 | err: |
392 | - dbg("%s: failed=%d", __func__, ret); | |
394 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
393 | 395 | return ret; |
394 | 396 | } |
395 | 397 | |
... | ... | @@ -398,7 +400,7 @@ |
398 | 400 | struct af9013_state *state = fe->demodulator_priv; |
399 | 401 | int ret; |
400 | 402 | |
401 | - dbg("%s", __func__); | |
403 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
402 | 404 | |
403 | 405 | /* start SNR meas */ |
404 | 406 | ret = af9013_wr_reg_bits(state, 0xd2e1, 3, 1, 1); |
... | ... | @@ -407,7 +409,7 @@ |
407 | 409 | |
408 | 410 | return ret; |
409 | 411 | err: |
410 | - dbg("%s: failed=%d", __func__, ret); | |
412 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
411 | 413 | return ret; |
412 | 414 | } |
413 | 415 | |
... | ... | @@ -419,7 +421,7 @@ |
419 | 421 | u32 snr_val; |
420 | 422 | const struct af9013_snr *uninitialized_var(snr_lut); |
421 | 423 | |
422 | - dbg("%s", __func__); | |
424 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
423 | 425 | |
424 | 426 | /* check if SNR ready */ |
425 | 427 | ret = af9013_rd_reg_bits(state, 0xd2e1, 3, 1, &tmp); |
... | ... | @@ -427,7 +429,7 @@ |
427 | 429 | goto err; |
428 | 430 | |
429 | 431 | if (!tmp) { |
430 | - dbg("%s: not ready", __func__); | |
432 | + dev_dbg(&state->i2c->dev, "%s: not ready\n", __func__); | |
431 | 433 | return 0; |
432 | 434 | } |
433 | 435 | |
... | ... | @@ -471,7 +473,7 @@ |
471 | 473 | |
472 | 474 | return ret; |
473 | 475 | err: |
474 | - dbg("%s: failed=%d", __func__, ret); | |
476 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
475 | 477 | return ret; |
476 | 478 | } |
477 | 479 | |
... | ... | @@ -482,7 +484,7 @@ |
482 | 484 | u8 buf[2], rf_gain, if_gain; |
483 | 485 | int signal_strength; |
484 | 486 | |
485 | - dbg("%s", __func__); | |
487 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
486 | 488 | |
487 | 489 | if (!state->signal_strength_en) |
488 | 490 | return 0; |
... | ... | @@ -508,7 +510,7 @@ |
508 | 510 | |
509 | 511 | return ret; |
510 | 512 | err: |
511 | - dbg("%s: failed=%d", __func__, ret); | |
513 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
512 | 514 | return ret; |
513 | 515 | } |
514 | 516 | |
... | ... | @@ -578,8 +580,8 @@ |
578 | 580 | u8 buf[6]; |
579 | 581 | u32 if_frequency, freq_cw; |
580 | 582 | |
581 | - dbg("%s: frequency=%d bandwidth_hz=%d", __func__, | |
582 | - c->frequency, c->bandwidth_hz); | |
583 | + dev_dbg(&state->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n", | |
584 | + __func__, c->frequency, c->bandwidth_hz); | |
583 | 585 | |
584 | 586 | /* program tuner */ |
585 | 587 | if (fe->ops.tuner_ops.set_params) |
... | ... | @@ -606,7 +608,8 @@ |
606 | 608 | else |
607 | 609 | if_frequency = state->config.if_frequency; |
608 | 610 | |
609 | - dbg("%s: if_frequency=%d", __func__, if_frequency); | |
611 | + dev_dbg(&state->i2c->dev, "%s: if_frequency=%d\n", | |
612 | + __func__, if_frequency); | |
610 | 613 | |
611 | 614 | sampling_freq = if_frequency; |
612 | 615 | |
... | ... | @@ -620,7 +623,8 @@ |
620 | 623 | spec_inv = !state->config.spec_inv; |
621 | 624 | } |
622 | 625 | |
623 | - freq_cw = af913_div(sampling_freq, state->config.clock, 23); | |
626 | + freq_cw = af9013_div(state, sampling_freq, state->config.clock, | |
627 | + 23); | |
624 | 628 | |
625 | 629 | if (spec_inv) |
626 | 630 | freq_cw = 0x800000 - freq_cw; |
... | ... | @@ -678,7 +682,8 @@ |
678 | 682 | buf[0] |= (1 << 0); |
679 | 683 | break; |
680 | 684 | default: |
681 | - dbg("%s: invalid transmission_mode", __func__); | |
685 | + dev_dbg(&state->i2c->dev, "%s: invalid transmission_mode\n", | |
686 | + __func__); | |
682 | 687 | auto_mode = 1; |
683 | 688 | } |
684 | 689 | |
... | ... | @@ -698,7 +703,8 @@ |
698 | 703 | buf[0] |= (3 << 2); |
699 | 704 | break; |
700 | 705 | default: |
701 | - dbg("%s: invalid guard_interval", __func__); | |
706 | + dev_dbg(&state->i2c->dev, "%s: invalid guard_interval\n", | |
707 | + __func__); | |
702 | 708 | auto_mode = 1; |
703 | 709 | } |
704 | 710 | |
... | ... | @@ -718,7 +724,7 @@ |
718 | 724 | buf[0] |= (3 << 4); |
719 | 725 | break; |
720 | 726 | default: |
721 | - dbg("%s: invalid hierarchy", __func__); | |
727 | + dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__); | |
722 | 728 | auto_mode = 1; |
723 | 729 | }; |
724 | 730 | |
... | ... | @@ -735,7 +741,7 @@ |
735 | 741 | buf[1] |= (2 << 6); |
736 | 742 | break; |
737 | 743 | default: |
738 | - dbg("%s: invalid modulation", __func__); | |
744 | + dev_dbg(&state->i2c->dev, "%s: invalid modulation\n", __func__); | |
739 | 745 | auto_mode = 1; |
740 | 746 | } |
741 | 747 | |
... | ... | @@ -761,7 +767,8 @@ |
761 | 767 | buf[2] |= (4 << 0); |
762 | 768 | break; |
763 | 769 | default: |
764 | - dbg("%s: invalid code_rate_HP", __func__); | |
770 | + dev_dbg(&state->i2c->dev, "%s: invalid code_rate_HP\n", | |
771 | + __func__); | |
765 | 772 | auto_mode = 1; |
766 | 773 | } |
767 | 774 | |
... | ... | @@ -786,7 +793,8 @@ |
786 | 793 | case FEC_NONE: |
787 | 794 | break; |
788 | 795 | default: |
789 | - dbg("%s: invalid code_rate_LP", __func__); | |
796 | + dev_dbg(&state->i2c->dev, "%s: invalid code_rate_LP\n", | |
797 | + __func__); | |
790 | 798 | auto_mode = 1; |
791 | 799 | } |
792 | 800 | |
... | ... | @@ -800,7 +808,8 @@ |
800 | 808 | buf[1] |= (2 << 2); |
801 | 809 | break; |
802 | 810 | default: |
803 | - dbg("%s: invalid bandwidth_hz", __func__); | |
811 | + dev_dbg(&state->i2c->dev, "%s: invalid bandwidth_hz\n", | |
812 | + __func__); | |
804 | 813 | ret = -EINVAL; |
805 | 814 | goto err; |
806 | 815 | } |
... | ... | @@ -815,7 +824,7 @@ |
815 | 824 | if (ret) |
816 | 825 | goto err; |
817 | 826 | |
818 | - dbg("%s: auto params", __func__); | |
827 | + dev_dbg(&state->i2c->dev, "%s: auto params\n", __func__); | |
819 | 828 | } else { |
820 | 829 | /* set easy mode flag */ |
821 | 830 | ret = af9013_wr_reg(state, 0xaefd, 1); |
... | ... | @@ -826,7 +835,7 @@ |
826 | 835 | if (ret) |
827 | 836 | goto err; |
828 | 837 | |
829 | - dbg("%s: manual params", __func__); | |
838 | + dev_dbg(&state->i2c->dev, "%s: manual params\n", __func__); | |
830 | 839 | } |
831 | 840 | |
832 | 841 | /* tune */ |
... | ... | @@ -840,7 +849,7 @@ |
840 | 849 | |
841 | 850 | return ret; |
842 | 851 | err: |
843 | - dbg("%s: failed=%d", __func__, ret); | |
852 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
844 | 853 | return ret; |
845 | 854 | } |
846 | 855 | |
... | ... | @@ -851,7 +860,7 @@ |
851 | 860 | int ret; |
852 | 861 | u8 buf[3]; |
853 | 862 | |
854 | - dbg("%s", __func__); | |
863 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
855 | 864 | |
856 | 865 | ret = af9013_rd_regs(state, 0xd3c0, buf, 3); |
857 | 866 | if (ret) |
... | ... | @@ -957,7 +966,7 @@ |
957 | 966 | |
958 | 967 | return ret; |
959 | 968 | err: |
960 | - dbg("%s: failed=%d", __func__, ret); | |
969 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
961 | 970 | return ret; |
962 | 971 | } |
963 | 972 | |
... | ... | @@ -1007,7 +1016,7 @@ |
1007 | 1016 | |
1008 | 1017 | return ret; |
1009 | 1018 | err: |
1010 | - dbg("%s: failed=%d", __func__, ret); | |
1019 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
1011 | 1020 | return ret; |
1012 | 1021 | } |
1013 | 1022 | |
... | ... | @@ -1047,7 +1056,7 @@ |
1047 | 1056 | u32 adc_cw; |
1048 | 1057 | const struct af9013_reg_bit *init; |
1049 | 1058 | |
1050 | - dbg("%s", __func__); | |
1059 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
1051 | 1060 | |
1052 | 1061 | /* power on */ |
1053 | 1062 | ret = af9013_power_ctrl(state, 1); |
1054 | 1063 | |
... | ... | @@ -1079,11 +1088,12 @@ |
1079 | 1088 | tmp = 3; |
1080 | 1089 | break; |
1081 | 1090 | default: |
1082 | - err("invalid clock"); | |
1091 | + dev_err(&state->i2c->dev, "%s: invalid clock\n", | |
1092 | + KBUILD_MODNAME); | |
1083 | 1093 | return -EINVAL; |
1084 | 1094 | } |
1085 | 1095 | |
1086 | - adc_cw = af913_div(state->config.clock, 1000000ul, 19); | |
1096 | + adc_cw = af9013_div(state, state->config.clock, 1000000ul, 19); | |
1087 | 1097 | buf[0] = (adc_cw >> 0) & 0xff; |
1088 | 1098 | buf[1] = (adc_cw >> 8) & 0xff; |
1089 | 1099 | buf[2] = (adc_cw >> 16) & 0xff; |
... | ... | @@ -1139,7 +1149,7 @@ |
1139 | 1149 | goto err; |
1140 | 1150 | |
1141 | 1151 | /* load OFSM settings */ |
1142 | - dbg("%s: load ofsm settings", __func__); | |
1152 | + dev_dbg(&state->i2c->dev, "%s: load ofsm settings\n", __func__); | |
1143 | 1153 | len = ARRAY_SIZE(ofsm_init); |
1144 | 1154 | init = ofsm_init; |
1145 | 1155 | for (i = 0; i < len; i++) { |
... | ... | @@ -1150,7 +1160,8 @@ |
1150 | 1160 | } |
1151 | 1161 | |
1152 | 1162 | /* load tuner specific settings */ |
1153 | - dbg("%s: load tuner specific settings", __func__); | |
1163 | + dev_dbg(&state->i2c->dev, "%s: load tuner specific settings\n", | |
1164 | + __func__); | |
1154 | 1165 | switch (state->config.tuner) { |
1155 | 1166 | case AF9013_TUNER_MXL5003D: |
1156 | 1167 | len = ARRAY_SIZE(tuner_init_mxl5003d); |
... | ... | @@ -1261,7 +1272,7 @@ |
1261 | 1272 | |
1262 | 1273 | return ret; |
1263 | 1274 | err: |
1264 | - dbg("%s: failed=%d", __func__, ret); | |
1275 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
1265 | 1276 | return ret; |
1266 | 1277 | } |
1267 | 1278 | |
... | ... | @@ -1270,7 +1281,7 @@ |
1270 | 1281 | struct af9013_state *state = fe->demodulator_priv; |
1271 | 1282 | int ret; |
1272 | 1283 | |
1273 | - dbg("%s", __func__); | |
1284 | + dev_dbg(&state->i2c->dev, "%s:\n", __func__); | |
1274 | 1285 | |
1275 | 1286 | /* stop statistics polling */ |
1276 | 1287 | cancel_delayed_work_sync(&state->statistics_work); |
... | ... | @@ -1287,7 +1298,7 @@ |
1287 | 1298 | |
1288 | 1299 | return ret; |
1289 | 1300 | err: |
1290 | - dbg("%s: failed=%d", __func__, ret); | |
1301 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
1291 | 1302 | return ret; |
1292 | 1303 | } |
1293 | 1304 | |
... | ... | @@ -1296,7 +1307,7 @@ |
1296 | 1307 | int ret; |
1297 | 1308 | struct af9013_state *state = fe->demodulator_priv; |
1298 | 1309 | |
1299 | - dbg("%s: enable=%d", __func__, enable); | |
1310 | + dev_dbg(&state->i2c->dev, "%s: enable=%d\n", __func__, enable); | |
1300 | 1311 | |
1301 | 1312 | /* gate already open or close */ |
1302 | 1313 | if (state->i2c_gate_state == enable) |
... | ... | @@ -1313,7 +1324,7 @@ |
1313 | 1324 | |
1314 | 1325 | return ret; |
1315 | 1326 | err: |
1316 | - dbg("%s: failed=%d", __func__, ret); | |
1327 | + dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret); | |
1317 | 1328 | return ret; |
1318 | 1329 | } |
1319 | 1330 | |
1320 | 1331 | |
1321 | 1332 | |
1322 | 1333 | |
... | ... | @@ -1340,25 +1351,28 @@ |
1340 | 1351 | if (ret) |
1341 | 1352 | goto err; |
1342 | 1353 | else |
1343 | - dbg("%s: firmware status=%02x", __func__, val); | |
1354 | + dev_dbg(&state->i2c->dev, "%s: firmware status=%02x\n", | |
1355 | + __func__, val); | |
1344 | 1356 | |
1345 | 1357 | if (val == 0x0c) /* fw is running, no need for download */ |
1346 | 1358 | goto exit; |
1347 | 1359 | |
1348 | - info("found a '%s' in cold state, will try to load a firmware", | |
1349 | - af9013_ops.info.name); | |
1360 | + dev_info(&state->i2c->dev, "%s: found a '%s' in cold state, will try " \ | |
1361 | + "to load a firmware\n", | |
1362 | + KBUILD_MODNAME, af9013_ops.info.name); | |
1350 | 1363 | |
1351 | 1364 | /* request the firmware, this will block and timeout */ |
1352 | 1365 | ret = request_firmware(&fw, fw_file, state->i2c->dev.parent); |
1353 | 1366 | if (ret) { |
1354 | - err("did not find the firmware file. (%s) " | |
1355 | - "Please see linux/Documentation/dvb/ for more details" \ | |
1356 | - " on firmware-problems. (%d)", | |
1357 | - fw_file, ret); | |
1367 | + dev_info(&state->i2c->dev, "%s: did not find the firmware " \ | |
1368 | + "file. (%s) Please see linux/Documentation/dvb/ for " \ | |
1369 | + "more details on firmware-problems. (%d)\n", | |
1370 | + KBUILD_MODNAME, fw_file, ret); | |
1358 | 1371 | goto err; |
1359 | 1372 | } |
1360 | 1373 | |
1361 | - info("downloading firmware from file '%s'", fw_file); | |
1374 | + dev_info(&state->i2c->dev, "%s: downloading firmware from file '%s'\n", | |
1375 | + KBUILD_MODNAME, fw_file); | |
1362 | 1376 | |
1363 | 1377 | /* calc checksum */ |
1364 | 1378 | for (i = 0; i < fw->size; i++) |
... | ... | @@ -1386,7 +1400,9 @@ |
1386 | 1400 | FW_ADDR + fw->size - remaining, |
1387 | 1401 | (u8 *) &fw->data[fw->size - remaining], len); |
1388 | 1402 | if (ret) { |
1389 | - err("firmware download failed:%d", ret); | |
1403 | + dev_err(&state->i2c->dev, | |
1404 | + "%s: firmware download failed=%d\n", | |
1405 | + KBUILD_MODNAME, ret); | |
1390 | 1406 | goto err_release; |
1391 | 1407 | } |
1392 | 1408 | } |
1393 | 1409 | |
1394 | 1410 | |
... | ... | @@ -1404,17 +1420,20 @@ |
1404 | 1420 | if (ret) |
1405 | 1421 | goto err_release; |
1406 | 1422 | |
1407 | - dbg("%s: firmware status=%02x", __func__, val); | |
1423 | + dev_dbg(&state->i2c->dev, "%s: firmware status=%02x\n", | |
1424 | + __func__, val); | |
1408 | 1425 | |
1409 | 1426 | if (val == 0x0c || val == 0x04) /* success or fail */ |
1410 | 1427 | break; |
1411 | 1428 | } |
1412 | 1429 | |
1413 | 1430 | if (val == 0x04) { |
1414 | - err("firmware did not run"); | |
1431 | + dev_err(&state->i2c->dev, "%s: firmware did not run\n", | |
1432 | + KBUILD_MODNAME); | |
1415 | 1433 | ret = -ENODEV; |
1416 | 1434 | } else if (val != 0x0c) { |
1417 | - err("firmware boot timeout"); | |
1435 | + dev_err(&state->i2c->dev, "%s: firmware boot timeout\n", | |
1436 | + KBUILD_MODNAME); | |
1418 | 1437 | ret = -ENODEV; |
1419 | 1438 | } |
1420 | 1439 | |
... | ... | @@ -1423,7 +1442,8 @@ |
1423 | 1442 | err: |
1424 | 1443 | exit: |
1425 | 1444 | if (!ret) |
1426 | - info("found a '%s' in warm state.", af9013_ops.info.name); | |
1445 | + dev_info(&state->i2c->dev, "%s: found a '%s' in warm state\n", | |
1446 | + KBUILD_MODNAME, af9013_ops.info.name); | |
1427 | 1447 | return ret; |
1428 | 1448 | } |
1429 | 1449 | |
... | ... | @@ -1455,7 +1475,8 @@ |
1455 | 1475 | if (ret) |
1456 | 1476 | goto err; |
1457 | 1477 | |
1458 | - info("firmware version %d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]); | |
1478 | + dev_info(&state->i2c->dev, "%s: firmware version %d.%d.%d.%d\n", | |
1479 | + KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3]); | |
1459 | 1480 | |
1460 | 1481 | /* set GPIOs */ |
1461 | 1482 | for (i = 0; i < sizeof(state->config.gpio); i++) { |
drivers/media/dvb-frontends/af9013.h
... | ... | @@ -110,7 +110,7 @@ |
110 | 110 | static inline struct dvb_frontend *af9013_attach( |
111 | 111 | const struct af9013_config *config, struct i2c_adapter *i2c) |
112 | 112 | { |
113 | - printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | |
113 | + pr_warn("%s: driver disabled by Kconfig\n", __func__); | |
114 | 114 | return NULL; |
115 | 115 | } |
116 | 116 | #endif /* CONFIG_DVB_AF9013 */ |
drivers/media/dvb-frontends/af9013_priv.h
... | ... | @@ -29,19 +29,6 @@ |
29 | 29 | #include "af9013.h" |
30 | 30 | #include <linux/firmware.h> |
31 | 31 | |
32 | -#define LOG_PREFIX "af9013" | |
33 | - | |
34 | -#undef dbg | |
35 | -#define dbg(f, arg...) \ | |
36 | - if (af9013_debug) \ | |
37 | - printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg) | |
38 | -#undef err | |
39 | -#define err(f, arg...) printk(KERN_ERR LOG_PREFIX": " f "\n" , ## arg) | |
40 | -#undef info | |
41 | -#define info(f, arg...) printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg) | |
42 | -#undef warn | |
43 | -#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg) | |
44 | - | |
45 | 32 | #define AF9013_FIRMWARE "dvb-fe-af9013.fw" |
46 | 33 | |
47 | 34 | struct af9013_reg_bit { |