Commit d2940930 authored by Hans Petter Selasky's avatar Hans Petter Selasky Committed by Mauro Carvalho Chehab

[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: default avatarHans Petter Selasky <hselasky@c2i.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a5bef1d2
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
static int debug; static int debug;
#define info(args...) do { printk(KERN_INFO "CX24113: " args); } while (0) #define cx_info(args...) do { printk(KERN_INFO "CX24113: " args); } while (0)
#define err(args...) do { printk(KERN_ERR "CX24113: " args); } while (0) #define cx_err(args...) do { printk(KERN_ERR "CX24113: " args); } while (0)
#define dprintk(args...) \ #define dprintk(args...) \
do { \ do { \
...@@ -341,7 +341,7 @@ static void cx24113_calc_pll_nf(struct cx24113_state *state, u16 *n, s32 *f) ...@@ -341,7 +341,7 @@ static void cx24113_calc_pll_nf(struct cx24113_state *state, u16 *n, s32 *f)
} while (N < 6 && R < 3); } while (N < 6 && R < 3);
if (N < 6) { if (N < 6) {
err("strange frequency: N < 6\n"); cx_err("strange frequency: N < 6\n");
return; return;
} }
F = freq_hz; F = freq_hz;
...@@ -563,7 +563,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe, ...@@ -563,7 +563,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
kzalloc(sizeof(struct cx24113_state), GFP_KERNEL); kzalloc(sizeof(struct cx24113_state), GFP_KERNEL);
int rc; int rc;
if (state == NULL) { if (state == NULL) {
err("Unable to kzalloc\n"); cx_err("Unable to kzalloc\n");
goto error; goto error;
} }
...@@ -571,7 +571,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe, ...@@ -571,7 +571,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
state->config = config; state->config = config;
state->i2c = i2c; state->i2c = i2c;
info("trying to detect myself\n"); cx_info("trying to detect myself\n");
/* making a dummy read, because of some expected troubles /* making a dummy read, because of some expected troubles
* after power on */ * after power on */
...@@ -579,24 +579,24 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe, ...@@ -579,24 +579,24 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
rc = cx24113_readreg(state, 0x00); rc = cx24113_readreg(state, 0x00);
if (rc < 0) { if (rc < 0) {
info("CX24113 not found.\n"); cx_info("CX24113 not found.\n");
goto error; goto error;
} }
state->rev = rc; state->rev = rc;
switch (rc) { switch (rc) {
case 0x43: case 0x43:
info("detected CX24113 variant\n"); cx_info("detected CX24113 variant\n");
break; break;
case REV_CX24113: case REV_CX24113:
info("successfully detected\n"); cx_info("successfully detected\n");
break; break;
default: default:
err("unsupported device id: %x\n", state->rev); cx_err("unsupported device id: %x\n", state->rev);
goto error; goto error;
} }
state->ver = cx24113_readreg(state, 0x01); state->ver = cx24113_readreg(state, 0x01);
info("version: %x\n", state->ver); cx_info("version: %x\n", state->ver);
/* create dvb_frontend */ /* create dvb_frontend */
memcpy(&fe->ops.tuner_ops, &cx24113_tuner_ops, memcpy(&fe->ops.tuner_ops, &cx24113_tuner_ops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment