diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c index 344d8b8e37e5c2458940d2c3479f4e6c6cc77b11..ff7f214961862f22970f1a6fee39521e07c0e690 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 9a394d4c70e41870b840449a22314a5b4474ecbb..076d2ddb5dde8f4ecf58ad35e1ba7f0bff73db8b 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