From: Joe Perches Date: Mon, 22 Sep 2014 17:50:35 +0000 (-0300) Subject: [media] tda18271-common: Convert _tda_printk to return void X-Git-Tag: firefly_0821_release~176^2~2474^2~469 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f531e735651555568816b6cf7631816003dc1d2;p=firefly-linux-kernel-4.4.55.git [media] tda18271-common: Convert _tda_printk to return void No caller or macro uses the return value so make it void. Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/tuners/tda18271-common.c b/drivers/media/tuners/tda18271-common.c index 18c77afe2e4f..86e5e3110118 100644 --- 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; } diff --git a/drivers/media/tuners/tda18271-priv.h b/drivers/media/tuners/tda18271-priv.h index 454c152ccaa0..b36a7b754772 100644 --- a/drivers/media/tuners/tda18271-priv.h +++ b/drivers/media/tuners/tda18271-priv.h @@ -139,8 +139,8 @@ extern int tda18271_debug; #define DBG_CAL 16 __attribute__((format(printf, 4, 5))) -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, ...); #define tda_printk(st, lvl, fmt, arg...) \ _tda_printk(st, lvl, __func__, fmt, ##arg)