3 files changed, 11 insertions, 53 deletions

diff --git a/drivers/media/dvb-frontends/ec100.c b/drivers/media/dvb-frontends/ec100.c
index c56fddbf53b7..b4ea34c2d09f 100644
--- a/drivers/media/dvb-frontends/ec100.c
+++ b/drivers/media/dvb-frontends/ec100.c
@@ -20,13 +20,8 @@
  */
 
 #include "dvb_frontend.h"
-#include "ec100_priv.h"
 #include "ec100.h"
 
-int ec100_debug;
-module_param_named(debug, ec100_debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
-
 struct ec100_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend frontend;
@@ -46,7 +41,8 @@ static int ec100_write_reg(struct ec100_state *state, u8 reg, u8 val)
                 .buf = buf};
 
         if (i2c_transfer(state->i2c, &msg, 1) != 1) {
-                warn("I2C write failed reg:%02x", reg);
+                dev_warn(&state->i2c->dev, "%s: i2c wr failed reg=%02x\n",
+                                KBUILD_MODNAME, reg);
                 return -EREMOTEIO;
         }
         return 0;
@@ -70,7 +66,8 @@ static int ec100_read_reg(struct ec100_state *state, u8 reg, u8 *val)
         };
 
         if (i2c_transfer(state->i2c, msg, 2) != 2) {
-                warn("I2C read failed reg:%02x", reg);
+                dev_warn(&state->i2c->dev, "%s: i2c rd failed reg=%02x\n",
+                                KBUILD_MODNAME, reg);
                 return -EREMOTEIO;
         }
         return 0;
@@ -83,8 +80,8 @@ static int ec100_set_frontend(struct dvb_frontend *fe)
         int ret;
         u8 tmp, tmp2;
 
-        deb_info("%s: freq:%d bw:%d\n", __func__, c->frequency,
-                c->bandwidth_hz);
+        dev_dbg(&state->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n",
+                        __func__, c->frequency, c->bandwidth_hz);
 
         /* program tuner */
         if (fe->ops.tuner_ops.set_params)
@@ -150,7 +147,7 @@ static int ec100_set_frontend(struct dvb_frontend *fe)
 
         return ret;
 error:
-        deb_info("%s: failed:%d\n", __func__, ret);
+        dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
 
@@ -196,7 +193,7 @@ static int ec100_read_status(struct dvb_frontend *fe, fe_status_t *status)
 
         return ret;
 error:
-        deb_info("%s: failed:%d\n", __func__, ret);
+        dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
 
@@ -228,7 +225,7 @@ static int ec100_read_ber(struct dvb_frontend *fe, u32 *ber)
 
         return ret;
 error:
-        deb_info("%s: failed:%d\n", __func__, ret);
+        dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
 
@@ -248,7 +245,7 @@ static int ec100_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
 
         return ret;
 error:
-        deb_info("%s: failed:%d\n", __func__, ret);
+        dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
 
diff --git a/drivers/media/dvb-frontends/ec100.h b/drivers/media/dvb-frontends/ec100.h
index ee8e52417958..b8479719d7f1 100644
--- a/drivers/media/dvb-frontends/ec100.h
+++ b/drivers/media/dvb-frontends/ec100.h
@@ -38,7 +38,7 @@ extern struct dvb_frontend *ec100_attach(const struct ec100_config *config,
 static inline struct dvb_frontend *ec100_attach(
         const struct ec100_config *config, struct i2c_adapter *i2c)
 {
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+        pr_warn("%s: driver disabled by Kconfig\n", __func__);
         return NULL;
 }
 #endif
diff --git a/drivers/media/dvb-frontends/ec100_priv.h b/drivers/media/dvb-frontends/ec100_priv.h
deleted file mode 100644
index 5c990144bc47..000000000000
--- a/drivers/media/dvb-frontends/ec100_priv.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * E3C EC100 demodulator driver
- *
- * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
- *
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef EC100_PRIV
-#define EC100_PRIV
-
-#define LOG_PREFIX "ec100"
-
-#define dprintk(var, level, args...) \
-        do { if ((var & level)) printk(args); } while (0)
-
-#define deb_info(args...) dprintk(ec100_debug, 0x01, args)
-
-#undef err
-#define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)
-#undef info
-#define info(f, arg...) printk(KERN_INFO    LOG_PREFIX": " f "\n" , ## arg)
-#undef warn
-#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
-
-#endif /* EC100_PRIV */