summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
diff options
context:
space:
mode:
authorHans Verkuil2013-06-18 01:56:40 +0200
committerMauro Carvalho Chehab2013-06-19 16:08:44 +0200
commitc778edb5bdb7a96712848493273762427a51e200 (patch)
tree902a6cc1568a87960b06ad3587a0c406042e6219 /drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
parent[media] r820t: fix imr calibration (diff)
downloadkernel-qcow2-linux-c778edb5bdb7a96712848493273762427a51e200.tar.gz
kernel-qcow2-linux-c778edb5bdb7a96712848493273762427a51e200.tar.xz
kernel-qcow2-linux-c778edb5bdb7a96712848493273762427a51e200.zip
[media] mxl111sf: don't redefine pr_err/info/debug
Remove the silly redefines of pr_err/info/debug. This improves readability and it also gets rid of a bunch of warnings when compiling this driver for older kernels using the compatibility media_build system. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c')
-rw-r--r--drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
index ef4c65fcbb73..879c529640f7 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
@@ -31,8 +31,6 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");
if (mxl111sf_tuner_debug) \
mxl_printk(KERN_DEBUG, fmt, ##arg)
-#define err pr_err
-
/* ------------------------------------------------------------------------ */
struct mxl111sf_tuner_state {
@@ -113,7 +111,7 @@ static struct mxl111sf_reg_ctrl_info *mxl111sf_calc_phy_tune_regs(u32 freq,
filt_bw = 63;
break;
default:
- err("%s: invalid bandwidth setting!", __func__);
+ pr_err("%s: invalid bandwidth setting!", __func__);
return NULL;
}
@@ -304,12 +302,12 @@ static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)
bw = 8;
break;
default:
- err("%s: bandwidth not set!", __func__);
+ pr_err("%s: bandwidth not set!", __func__);
return -EINVAL;
}
break;
default:
- err("%s: modulation type not supported!", __func__);
+ pr_err("%s: modulation type not supported!", __func__);
return -EINVAL;
}
ret = mxl1x1sf_tune_rf(fe, c->frequency, bw);