Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / media / tuners / tda18271-common.c

diff --git a/drivers/media/tuners/tda18271-common.c b/drivers/media/tuners/tda18271-common.c
index 18c77af..86e5e31 100644 (file)
--- a/drivers/media/tuners/tda18271-common.c
+++ b/drivers/media/tuners/tda18271-common.c
@@ -714,12 +714,11 @@ fail:
        return ret;
 }
 
-int _tda_printk(struct tda18271_priv *state, const char *level,
-               const char *func, const char *fmt, ...)
+void _tda_printk(struct tda18271_priv *state, const char *level,
+                const char *func, const char *fmt, ...)
 {
        struct va_format vaf;
        va_list args;
-       int rtn;
 
        va_start(args, fmt);
 
@@ -727,15 +726,13 @@ int _tda_printk(struct tda18271_priv *state, const char *level,
        vaf.va = &args;
 
        if (state)
-               rtn = printk("%s%s: [%d-%04x|%c] %pV",
-                            level, func, i2c_adapter_id(state->i2c_props.adap),
-                            state->i2c_props.addr,
-                            (state->role == TDA18271_MASTER) ? 'M' : 'S',
-                            &vaf);
+               printk("%s%s: [%d-%04x|%c] %pV",
+                      level, func, i2c_adapter_id(state->i2c_props.adap),
+                      state->i2c_props.addr,
+                      (state->role == TDA18271_MASTER) ? 'M' : 'S',
+                      &vaf);
        else
-               rtn = printk("%s%s: %pV", level, func, &vaf);
+               printk("%s%s: %pV", level, func, &vaf);
 
        va_end(args);
-
-       return rtn;
 }