Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[~andy/linux] / drivers / media / usb / dvb-usb-v2 / mxl111sf-tuner.c

diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c b/drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
index ef4c65fcbb734ce6852dbd30856a5f3409849e86..879c529640f7e20234ef3a40a9231223c110259a 100644 (file)
--- 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);