summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Boettcher <patrick.boettcher@posteo.de>2015-04-17 11:04:53 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-18 21:32:15 +0200
commitc5fb0f5f545cdf90c451ea7c9a6fb98ae4c64e49 (patch)
tree14131e4b784c49bc8df8e64f09978df3c261d505
parent[media] Add support for TechniSat Skystar S2 (diff)
downloadlinux-c5fb0f5f545cdf90c451ea7c9a6fb98ae4c64e49.tar.xz
linux-c5fb0f5f545cdf90c451ea7c9a6fb98ae4c64e49.zip
[media] cx24120: minor checkpatch fixes
This patch fixes printk-related checkpatch warnings. All printks have been converted to pr_warn or pr_info or pr_err. Signed-off-by: Patrick.Boettcher <patrick.boettcher@posteo.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/dvb-frontends/cx24120.c7
-rw-r--r--drivers/media/dvb-frontends/cx24120.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
index 344d8b8e37e5..ff7f21496186 100644
--- a/drivers/media/dvb-frontends/cx24120.c
+++ b/drivers/media/dvb-frontends/cx24120.c
@@ -108,11 +108,8 @@ enum command_message_id {
#define CX24120_STATUS_MASK (0x0f)
#define CX24120_SIGNAL_MASK (0xc0)
-#define info(args...) do { printk(KERN_INFO "cx24120: "); \
- printk(args); } while (0)
-#define err(args...) do { printk(KERN_ERR "cx24120: ### ERROR: "); \
- printk(args); } while (0)
-
+#define info(args...) pr_info("cx24120: " args)
+#define err(args...) pr_err("cx24120: ### ERROR: " args)
/* The Demod/Tuner can't easily provide these, we cache them */
struct cx24120_tuning {
diff --git a/drivers/media/dvb-frontends/cx24120.h b/drivers/media/dvb-frontends/cx24120.h
index 9a394d4c70e4..076d2ddb5dde 100644
--- a/drivers/media/dvb-frontends/cx24120.h
+++ b/drivers/media/dvb-frontends/cx24120.h
@@ -48,7 +48,7 @@ static inline struct dvb_frontend *cx24120_attach(
const struct cx24120_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