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

[media] cx24113: Don't reuse core macro names

The info and err macros are already defined by the USB stack. Rename
these macros to avoid macro redefinition warnings.

Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Hans Petter Selasky and committed by
Mauro Carvalho Chehab
d2940930 a5bef1d2

+10 -10
+10 -10
drivers/media/dvb/frontends/cx24113.c
··· 31 31 32 32 static int debug; 33 33 34 - #define info(args...) do { printk(KERN_INFO "CX24113: " args); } while (0) 35 - #define err(args...) do { printk(KERN_ERR "CX24113: " args); } while (0) 34 + #define cx_info(args...) do { printk(KERN_INFO "CX24113: " args); } while (0) 35 + #define cx_err(args...) do { printk(KERN_ERR "CX24113: " args); } while (0) 36 36 37 37 #define dprintk(args...) \ 38 38 do { \ ··· 341 341 } while (N < 6 && R < 3); 342 342 343 343 if (N < 6) { 344 - err("strange frequency: N < 6\n"); 344 + cx_err("strange frequency: N < 6\n"); 345 345 return; 346 346 } 347 347 F = freq_hz; ··· 563 563 kzalloc(sizeof(struct cx24113_state), GFP_KERNEL); 564 564 int rc; 565 565 if (state == NULL) { 566 - err("Unable to kzalloc\n"); 566 + cx_err("Unable to kzalloc\n"); 567 567 goto error; 568 568 } 569 569 ··· 571 571 state->config = config; 572 572 state->i2c = i2c; 573 573 574 - info("trying to detect myself\n"); 574 + cx_info("trying to detect myself\n"); 575 575 576 576 /* making a dummy read, because of some expected troubles 577 577 * after power on */ ··· 579 579 580 580 rc = cx24113_readreg(state, 0x00); 581 581 if (rc < 0) { 582 - info("CX24113 not found.\n"); 582 + cx_info("CX24113 not found.\n"); 583 583 goto error; 584 584 } 585 585 state->rev = rc; 586 586 587 587 switch (rc) { 588 588 case 0x43: 589 - info("detected CX24113 variant\n"); 589 + cx_info("detected CX24113 variant\n"); 590 590 break; 591 591 case REV_CX24113: 592 - info("successfully detected\n"); 592 + cx_info("successfully detected\n"); 593 593 break; 594 594 default: 595 - err("unsupported device id: %x\n", state->rev); 595 + cx_err("unsupported device id: %x\n", state->rev); 596 596 goto error; 597 597 } 598 598 state->ver = cx24113_readreg(state, 0x01); 599 - info("version: %x\n", state->ver); 599 + cx_info("version: %x\n", state->ver); 600 600 601 601 /* create dvb_frontend */ 602 602 memcpy(&fe->ops.tuner_ops, &cx24113_tuner_ops,