aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-09-22 13:50:35 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-23 16:03:59 -0400
commit0f531e735651555568816b6cf7631816003dc1d2 (patch)
treec6029f115fa8466012ba99ecefa3f06cb0d32f5e
parentda8e77f5e945ee92a6225c18f545630e07fc41bc (diff)
[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 <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/tuners/tda18271-common.c19
-rw-r--r--drivers/media/tuners/tda18271-priv.h4
2 files changed, 10 insertions, 13 deletions
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:
714 return ret; 714 return ret;
715} 715}
716 716
717int _tda_printk(struct tda18271_priv *state, const char *level, 717void _tda_printk(struct tda18271_priv *state, const char *level,
718 const char *func, const char *fmt, ...) 718 const char *func, const char *fmt, ...)
719{ 719{
720 struct va_format vaf; 720 struct va_format vaf;
721 va_list args; 721 va_list args;
722 int rtn;
723 722
724 va_start(args, fmt); 723 va_start(args, fmt);
725 724
@@ -727,15 +726,13 @@ int _tda_printk(struct tda18271_priv *state, const char *level,
727 vaf.va = &args; 726 vaf.va = &args;
728 727
729 if (state) 728 if (state)
730 rtn = printk("%s%s: [%d-%04x|%c] %pV", 729 printk("%s%s: [%d-%04x|%c] %pV",
731 level, func, i2c_adapter_id(state->i2c_props.adap), 730 level, func, i2c_adapter_id(state->i2c_props.adap),
732 state->i2c_props.addr, 731 state->i2c_props.addr,
733 (state->role == TDA18271_MASTER) ? 'M' : 'S', 732 (state->role == TDA18271_MASTER) ? 'M' : 'S',
734 &vaf); 733 &vaf);
735 else 734 else
736 rtn = printk("%s%s: %pV", level, func, &vaf); 735 printk("%s%s: %pV", level, func, &vaf);
737 736
738 va_end(args); 737 va_end(args);
739
740 return rtn;
741} 738}
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;
139#define DBG_CAL 16 139#define DBG_CAL 16
140 140
141__attribute__((format(printf, 4, 5))) 141__attribute__((format(printf, 4, 5)))
142int _tda_printk(struct tda18271_priv *state, const char *level, 142void _tda_printk(struct tda18271_priv *state, const char *level,
143 const char *func, const char *fmt, ...); 143 const char *func, const char *fmt, ...);
144 144
145#define tda_printk(st, lvl, fmt, arg...) \ 145#define tda_printk(st, lvl, fmt, arg...) \
146 _tda_printk(st, lvl, __func__, fmt, ##arg) 146 _tda_printk(st, lvl, __func__, fmt, ##arg)