tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] dib3000mb: use pr_foo() instead of printk()

The dprintk() macro relies on continuation lines. This is not
a good practice and will break after commit 563873318d32
("Merge branch 'printk-cleanups'").

So, instead of directly calling printk(), use pr_foo() macros,
adding a \n leading char on each macro call.

The frontend settings also rely on continuation lines. Change
it to avoid the need of adding pr_cont() calls.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

Mauro Carvalho Chehab 585e3227 4bd1a8dd

+71 -82
+64 -73
drivers/media/dvb-frontends/dib3000mb.c
··· 21 21 * 22 22 */ 23 23 24 + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 25 + 24 26 #include <linux/kernel.h> 25 27 #include <linux/module.h> 26 28 #include <linux/init.h> ··· 44 42 module_param(debug, int, 0644); 45 43 MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able))."); 46 44 47 - #define deb_info(args...) dprintk(0x01,args) 48 - #define deb_i2c(args...) dprintk(0x02,args) 49 - #define deb_srch(args...) dprintk(0x04,args) 50 - #define deb_info(args...) dprintk(0x01,args) 51 - #define deb_xfer(args...) dprintk(0x02,args) 52 - #define deb_setf(args...) dprintk(0x04,args) 53 - #define deb_getf(args...) dprintk(0x08,args) 45 + #define deb_info(args...) dprintk(0x01, args) 46 + #define deb_i2c(args...) dprintk(0x02, args) 47 + #define deb_srch(args...) dprintk(0x04, args) 48 + #define deb_info(args...) dprintk(0x01, args) 49 + #define deb_xfer(args...) dprintk(0x02, args) 50 + #define deb_setf(args...) dprintk(0x04, args) 51 + #define deb_getf(args...) dprintk(0x08, args) 54 52 55 53 static int dib3000_read_reg(struct dib3000_state *state, u16 reg) 56 54 { ··· 128 126 fe->ops.tuner_ops.set_params(fe); 129 127 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); 130 128 131 - deb_setf("bandwidth: "); 132 129 switch (c->bandwidth_hz) { 133 130 case 8000000: 134 - deb_setf("8 MHz\n"); 135 131 wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[2]); 136 132 wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_8mhz); 137 133 break; 138 134 case 7000000: 139 - deb_setf("7 MHz\n"); 140 135 wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[1]); 141 136 wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_7mhz); 142 137 break; 143 138 case 6000000: 144 - deb_setf("6 MHz\n"); 145 139 wr_foreach(dib3000mb_reg_timing_freq, dib3000mb_timing_freq[0]); 146 140 wr_foreach(dib3000mb_reg_bandwidth, dib3000mb_bandwidth_6mhz); 147 141 break; 148 142 case 0: 149 143 return -EOPNOTSUPP; 150 144 default: 151 - err("unknown bandwidth value."); 145 + pr_err("unknown bandwidth value.\n"); 152 146 return -EINVAL; 153 147 } 148 + deb_setf("bandwidth: %d MHZ\n", c->bandwidth_hz / 1000000); 154 149 } 155 150 wr(DIB3000MB_REG_LOCK1_MASK, DIB3000MB_LOCK1_SEARCH_4); 156 151 157 - deb_setf("transmission mode: "); 158 152 switch (c->transmission_mode) { 159 153 case TRANSMISSION_MODE_2K: 160 - deb_setf("2k\n"); 154 + deb_setf("transmission mode: 2k\n"); 161 155 wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_2K); 162 156 break; 163 157 case TRANSMISSION_MODE_8K: 164 - deb_setf("8k\n"); 158 + deb_setf("transmission mode: 8k\n"); 165 159 wr(DIB3000MB_REG_FFT, DIB3000_TRANSMISSION_MODE_8K); 166 160 break; 167 161 case TRANSMISSION_MODE_AUTO: 168 - deb_setf("auto\n"); 162 + deb_setf("transmission mode: auto\n"); 169 163 break; 170 164 default: 171 165 return -EINVAL; 172 166 } 173 167 174 - deb_setf("guard: "); 175 168 switch (c->guard_interval) { 176 169 case GUARD_INTERVAL_1_32: 177 - deb_setf("1_32\n"); 170 + deb_setf("guard 1_32\n"); 178 171 wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_32); 179 172 break; 180 173 case GUARD_INTERVAL_1_16: 181 - deb_setf("1_16\n"); 174 + deb_setf("guard 1_16\n"); 182 175 wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_16); 183 176 break; 184 177 case GUARD_INTERVAL_1_8: 185 - deb_setf("1_8\n"); 178 + deb_setf("guard 1_8\n"); 186 179 wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_8); 187 180 break; 188 181 case GUARD_INTERVAL_1_4: 189 - deb_setf("1_4\n"); 182 + deb_setf("guard 1_4\n"); 190 183 wr(DIB3000MB_REG_GUARD_TIME, DIB3000_GUARD_TIME_1_4); 191 184 break; 192 185 case GUARD_INTERVAL_AUTO: 193 - deb_setf("auto\n"); 186 + deb_setf("guard auto\n"); 194 187 break; 195 188 default: 196 189 return -EINVAL; 197 190 } 198 191 199 - deb_setf("inversion: "); 200 192 switch (c->inversion) { 201 193 case INVERSION_OFF: 202 - deb_setf("off\n"); 194 + deb_setf("inversion off\n"); 203 195 wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_OFF); 204 196 break; 205 197 case INVERSION_AUTO: 206 - deb_setf("auto "); 198 + deb_setf("inversion auto\n"); 207 199 break; 208 200 case INVERSION_ON: 209 - deb_setf("on\n"); 201 + deb_setf("inversion on\n"); 210 202 wr(DIB3000MB_REG_DDS_INV, DIB3000_DDS_INVERSION_ON); 211 203 break; 212 204 default: 213 205 return -EINVAL; 214 206 } 215 207 216 - deb_setf("modulation: "); 217 208 switch (c->modulation) { 218 209 case QPSK: 219 - deb_setf("qpsk\n"); 210 + deb_setf("modulation: qpsk\n"); 220 211 wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_QPSK); 221 212 break; 222 213 case QAM_16: 223 - deb_setf("qam16\n"); 214 + deb_setf("modulation: qam16\n"); 224 215 wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_16QAM); 225 216 break; 226 217 case QAM_64: 227 - deb_setf("qam64\n"); 218 + deb_setf("modulation: qam64\n"); 228 219 wr(DIB3000MB_REG_QAM, DIB3000_CONSTELLATION_64QAM); 229 220 break; 230 221 case QAM_AUTO: ··· 225 230 default: 226 231 return -EINVAL; 227 232 } 228 - deb_setf("hierarchy: "); 229 233 switch (c->hierarchy) { 230 234 case HIERARCHY_NONE: 231 - deb_setf("none "); 235 + deb_setf("hierarchy: none\n"); 232 236 /* fall through */ 233 237 case HIERARCHY_1: 234 - deb_setf("alpha=1\n"); 238 + deb_setf("hierarchy: alpha=1\n"); 235 239 wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_1); 236 240 break; 237 241 case HIERARCHY_2: 238 - deb_setf("alpha=2\n"); 242 + deb_setf("hierarchy: alpha=2\n"); 239 243 wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_2); 240 244 break; 241 245 case HIERARCHY_4: 242 - deb_setf("alpha=4\n"); 246 + deb_setf("hierarchy: alpha=4\n"); 243 247 wr(DIB3000MB_REG_VIT_ALPHA, DIB3000_ALPHA_4); 244 248 break; 245 249 case HIERARCHY_AUTO: 246 - deb_setf("alpha=auto\n"); 250 + deb_setf("hierarchy: alpha=auto\n"); 247 251 break; 248 252 default: 249 253 return -EINVAL; 250 254 } 251 255 252 - deb_setf("hierarchy: "); 253 256 if (c->hierarchy == HIERARCHY_NONE) { 254 - deb_setf("none\n"); 255 257 wr(DIB3000MB_REG_VIT_HRCH, DIB3000_HRCH_OFF); 256 258 wr(DIB3000MB_REG_VIT_HP, DIB3000_SELECT_HP); 257 259 fe_cr = c->code_rate_HP; 258 260 } else if (c->hierarchy != HIERARCHY_AUTO) { 259 - deb_setf("on\n"); 260 261 wr(DIB3000MB_REG_VIT_HRCH, DIB3000_HRCH_ON); 261 262 wr(DIB3000MB_REG_VIT_HP, DIB3000_SELECT_LP); 262 263 fe_cr = c->code_rate_LP; 263 264 } 264 - deb_setf("fec: "); 265 265 switch (fe_cr) { 266 266 case FEC_1_2: 267 - deb_setf("1_2\n"); 267 + deb_setf("fec: 1_2\n"); 268 268 wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_1_2); 269 269 break; 270 270 case FEC_2_3: 271 - deb_setf("2_3\n"); 271 + deb_setf("fec: 2_3\n"); 272 272 wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_2_3); 273 273 break; 274 274 case FEC_3_4: 275 - deb_setf("3_4\n"); 275 + deb_setf("fec: 3_4\n"); 276 276 wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_3_4); 277 277 break; 278 278 case FEC_5_6: 279 - deb_setf("5_6\n"); 279 + deb_setf("fec: 5_6\n"); 280 280 wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_5_6); 281 281 break; 282 282 case FEC_7_8: 283 - deb_setf("7_8\n"); 283 + deb_setf("fec: 7_8\n"); 284 284 wr(DIB3000MB_REG_VIT_CODE_RATE, DIB3000_FEC_7_8); 285 285 break; 286 286 case FEC_NONE: 287 - deb_setf("none "); 287 + deb_setf("fec: none\n"); 288 288 break; 289 289 case FEC_AUTO: 290 - deb_setf("auto\n"); 290 + deb_setf("fec: auto\n"); 291 291 break; 292 292 default: 293 293 return -EINVAL; ··· 347 357 rd(DIB3000MB_REG_LOCK2_VALUE))) < 0 && as_count++ < 100) 348 358 msleep(1); 349 359 350 - deb_setf("search_state after autosearch %d after %d checks\n",search_state,as_count); 360 + deb_setf("search_state after autosearch %d after %d checks\n", 361 + search_state, as_count); 351 362 352 363 if (search_state == 1) { 353 364 if (dib3000mb_get_frontend(fe, c) == 0) { ··· 455 464 return 0; 456 465 457 466 dds_val = ((rd(DIB3000MB_REG_DDS_VALUE_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_VALUE_LSB); 458 - deb_getf("DDS_VAL: %x %x %x",dds_val, rd(DIB3000MB_REG_DDS_VALUE_MSB), rd(DIB3000MB_REG_DDS_VALUE_LSB)); 467 + deb_getf("DDS_VAL: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_VALUE_MSB), rd(DIB3000MB_REG_DDS_VALUE_LSB)); 459 468 if (dds_val < threshold) 460 469 inv_test1 = 0; 461 470 else if (dds_val == threshold) ··· 464 473 inv_test1 = 2; 465 474 466 475 dds_val = ((rd(DIB3000MB_REG_DDS_FREQ_MSB) & 0xff) << 16) + rd(DIB3000MB_REG_DDS_FREQ_LSB); 467 - deb_getf("DDS_FREQ: %x %x %x",dds_val, rd(DIB3000MB_REG_DDS_FREQ_MSB), rd(DIB3000MB_REG_DDS_FREQ_LSB)); 476 + deb_getf("DDS_FREQ: %x %x %x\n", dds_val, rd(DIB3000MB_REG_DDS_FREQ_MSB), rd(DIB3000MB_REG_DDS_FREQ_LSB)); 468 477 if (dds_val < threshold) 469 478 inv_test2 = 0; 470 479 else if (dds_val == threshold) ··· 481 490 482 491 switch ((tps_val = rd(DIB3000MB_REG_TPS_QAM))) { 483 492 case DIB3000_CONSTELLATION_QPSK: 484 - deb_getf("QPSK "); 493 + deb_getf("QPSK\n"); 485 494 c->modulation = QPSK; 486 495 break; 487 496 case DIB3000_CONSTELLATION_16QAM: 488 - deb_getf("QAM16 "); 497 + deb_getf("QAM16\n"); 489 498 c->modulation = QAM_16; 490 499 break; 491 500 case DIB3000_CONSTELLATION_64QAM: 492 - deb_getf("QAM64 "); 501 + deb_getf("QAM64\n"); 493 502 c->modulation = QAM_64; 494 503 break; 495 504 default: 496 - err("Unexpected constellation returned by TPS (%d)", tps_val); 505 + pr_err("Unexpected constellation returned by TPS (%d)\n", tps_val); 497 506 break; 498 507 } 499 508 deb_getf("TPS: %d\n", tps_val); ··· 504 513 c->code_rate_HP = FEC_NONE; 505 514 switch ((tps_val = rd(DIB3000MB_REG_TPS_VIT_ALPHA))) { 506 515 case DIB3000_ALPHA_0: 507 - deb_getf("HIERARCHY_NONE "); 516 + deb_getf("HIERARCHY_NONE\n"); 508 517 c->hierarchy = HIERARCHY_NONE; 509 518 break; 510 519 case DIB3000_ALPHA_1: 511 - deb_getf("HIERARCHY_1 "); 520 + deb_getf("HIERARCHY_1\n"); 512 521 c->hierarchy = HIERARCHY_1; 513 522 break; 514 523 case DIB3000_ALPHA_2: 515 - deb_getf("HIERARCHY_2 "); 524 + deb_getf("HIERARCHY_2\n"); 516 525 c->hierarchy = HIERARCHY_2; 517 526 break; 518 527 case DIB3000_ALPHA_4: 519 - deb_getf("HIERARCHY_4 "); 528 + deb_getf("HIERARCHY_4\n"); 520 529 c->hierarchy = HIERARCHY_4; 521 530 break; 522 531 default: 523 - err("Unexpected ALPHA value returned by TPS (%d)", tps_val); 532 + pr_err("Unexpected ALPHA value returned by TPS (%d)\n", tps_val); 524 533 break; 525 534 } 526 535 deb_getf("TPS: %d\n", tps_val); ··· 537 546 538 547 switch (tps_val) { 539 548 case DIB3000_FEC_1_2: 540 - deb_getf("FEC_1_2 "); 549 + deb_getf("FEC_1_2\n"); 541 550 *cr = FEC_1_2; 542 551 break; 543 552 case DIB3000_FEC_2_3: 544 - deb_getf("FEC_2_3 "); 553 + deb_getf("FEC_2_3\n"); 545 554 *cr = FEC_2_3; 546 555 break; 547 556 case DIB3000_FEC_3_4: 548 - deb_getf("FEC_3_4 "); 557 + deb_getf("FEC_3_4\n"); 549 558 *cr = FEC_3_4; 550 559 break; 551 560 case DIB3000_FEC_5_6: 552 - deb_getf("FEC_5_6 "); 561 + deb_getf("FEC_5_6\n"); 553 562 *cr = FEC_4_5; 554 563 break; 555 564 case DIB3000_FEC_7_8: 556 - deb_getf("FEC_7_8 "); 565 + deb_getf("FEC_7_8\n"); 557 566 *cr = FEC_7_8; 558 567 break; 559 568 default: 560 - err("Unexpected FEC returned by TPS (%d)", tps_val); 569 + pr_err("Unexpected FEC returned by TPS (%d)\n", tps_val); 561 570 break; 562 571 } 563 572 deb_getf("TPS: %d\n",tps_val); 564 573 565 574 switch ((tps_val = rd(DIB3000MB_REG_TPS_GUARD_TIME))) { 566 575 case DIB3000_GUARD_TIME_1_32: 567 - deb_getf("GUARD_INTERVAL_1_32 "); 576 + deb_getf("GUARD_INTERVAL_1_32\n"); 568 577 c->guard_interval = GUARD_INTERVAL_1_32; 569 578 break; 570 579 case DIB3000_GUARD_TIME_1_16: 571 - deb_getf("GUARD_INTERVAL_1_16 "); 580 + deb_getf("GUARD_INTERVAL_1_16\n"); 572 581 c->guard_interval = GUARD_INTERVAL_1_16; 573 582 break; 574 583 case DIB3000_GUARD_TIME_1_8: 575 - deb_getf("GUARD_INTERVAL_1_8 "); 584 + deb_getf("GUARD_INTERVAL_1_8\n"); 576 585 c->guard_interval = GUARD_INTERVAL_1_8; 577 586 break; 578 587 case DIB3000_GUARD_TIME_1_4: 579 - deb_getf("GUARD_INTERVAL_1_4 "); 588 + deb_getf("GUARD_INTERVAL_1_4\n"); 580 589 c->guard_interval = GUARD_INTERVAL_1_4; 581 590 break; 582 591 default: 583 - err("Unexpected Guard Time returned by TPS (%d)", tps_val); 592 + pr_err("Unexpected Guard Time returned by TPS (%d)\n", tps_val); 584 593 break; 585 594 } 586 595 deb_getf("TPS: %d\n", tps_val); 587 596 588 597 switch ((tps_val = rd(DIB3000MB_REG_TPS_FFT))) { 589 598 case DIB3000_TRANSMISSION_MODE_2K: 590 - deb_getf("TRANSMISSION_MODE_2K "); 599 + deb_getf("TRANSMISSION_MODE_2K\n"); 591 600 c->transmission_mode = TRANSMISSION_MODE_2K; 592 601 break; 593 602 case DIB3000_TRANSMISSION_MODE_8K: 594 - deb_getf("TRANSMISSION_MODE_8K "); 603 + deb_getf("TRANSMISSION_MODE_8K\n"); 595 604 c->transmission_mode = TRANSMISSION_MODE_8K; 596 605 break; 597 606 default: 598 - err("unexpected transmission mode return by TPS (%d)", tps_val); 607 + pr_err("unexpected transmission mode return by TPS (%d)\n", tps_val); 599 608 break; 600 609 } 601 610 deb_getf("TPS: %d\n", tps_val);
+7 -9
drivers/media/dvb-frontends/dib3000mb_priv.h
··· 13 13 #ifndef __DIB3000MB_PRIV_H_INCLUDED__ 14 14 #define __DIB3000MB_PRIV_H_INCLUDED__ 15 15 16 - /* info and err, taken from usb.h, if there is anything available like by default. */ 17 - #define err(format, arg...) printk(KERN_ERR "dib3000: " format "\n" , ## arg) 18 - #define info(format, arg...) printk(KERN_INFO "dib3000: " format "\n" , ## arg) 19 - #define warn(format, arg...) printk(KERN_WARNING "dib3000: " format "\n" , ## arg) 20 - 21 16 /* handy shortcuts */ 22 17 #define rd(reg) dib3000_read_reg(state,reg) 23 18 24 19 #define wr(reg,val) if (dib3000_write_reg(state,reg,val)) \ 25 - { err("while sending 0x%04x to 0x%04x.",val,reg); return -EREMOTEIO; } 20 + { pr_err("while sending 0x%04x to 0x%04x.", val, reg); return -EREMOTEIO; } 26 21 27 22 #define wr_foreach(a,v) { int i; \ 28 23 if (sizeof(a) != sizeof(v)) \ 29 - err("sizeof: %zu %zu is different",sizeof(a),sizeof(v));\ 24 + pr_err("sizeof: %zu %zu is different", sizeof(a), sizeof(v));\ 30 25 for (i=0; i < sizeof(a)/sizeof(u16); i++) \ 31 26 wr(a[i],v[i]); \ 32 27 } ··· 32 37 33 38 /* debug */ 34 39 35 - #define dprintk(level,args...) \ 36 - do { if ((debug & level)) { printk(args); } } while (0) 40 + #define dprintk(level, fmt, arg...) do { \ 41 + if (debug & level) \ 42 + printk(KERN_DEBUG pr_fmt("%s: " fmt), \ 43 + __func__, ##arg); \ 44 + } while (0) 37 45 38 46 /* mask for enabling a specific pid for the pid_filter */ 39 47 #define DIB3000_ACTIVATE_PID_FILTERING (0x2000)