On Tue, 2019-11-12 at 16:55 -0300, Daniel W. S. Almeida wrote:
[]
> diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
[]
> @@ -67,31 +67,37 @@ static int debug;
> module_param(debug, int, 0644);
> MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
>
> -#define dprintk(level,x...) if (level & debug) printk(x)
> -#define dbufout(b,l,m) {\
> - int i; \
> - for (i = 0; i < l; i++) \
> - m("%02x ",b[i]); \
> +#define dprintk(level, x...) if (level & debug) printk(KERN_DEBUG x)
> +#define dbufout(b, l, m) {\
> + int i; \
> + for (i = 0; i < l; i++) \
> + m("%02x ", b[i]); \
> }
> -#define deb_info(args...) dprintk(0x01,args)
> -#define deb_i2c(args...) dprintk(0x02,args)
> -#define deb_hab(args...) dprintk(0x04,args)
> +#define deb_info(args...) dprintk(0x01, args)
> +#define deb_i2c(args...) dprintk(0x02, args)
> +#define deb_hab(args...) dprintk(0x04, args)
These debug functions, if used, will make a mess of the
actual output and these will all print on single lines.
The dbufout macro will really make a mess of the logging.
This should really be something like:
---
drivers/media/dvb-frontends/bcm3510.c | 51 +++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 20 deletions(-)
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index e92542..7bb560a7 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -67,15 +67,29 @@ static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able)).");
-#define dprintk(level,x...) if (level & debug) printk(x)
-#define dbufout(b,l,m) {\
- int i; \
- for (i = 0; i < l; i++) \
- m("%02x ",b[i]); \
-}
-#define deb_info(args...) dprintk(0x01,args)
-#define deb_i2c(args...) dprintk(0x02,args)
-#define deb_hab(args...) dprintk(0x04,args)
+#define DBG_INFO 0x01
+#define DBG_I2C 0x02
+#define DBG_HAB 0x04
+
+#define dprintk(level, fmt, ...) \
+do { \
+ if ((level) & debug) \
+ printk(KERN_DEBUG fmt, ##__VA_ARGS__); \
+} while (0)
+
+#define dbufout(level, buf, count) \
+do { \
+ if ((level) & debug) { \
+ int i; \
+ for (i = 0; i < (count); i++) \
+ pr_cont(" %02x", buf[i]); \
+ pr_cont("\n"); \
+ } \
+} while (0)
+
+#define deb_info(fmt, ...) dprintk(DBG_INFO, fmt, ##__VA_ARGS__)
+#define deb_i2c(fmt, ...) dprintk(DBG_I2C, fmt, ##__VA_ARGS__)
+#define deb_hab(fmt, ...) dprintk(DBG_HAB, fmt, ##__VA_ARGS__)
/* transfer functions */
static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 len)
@@ -87,9 +101,8 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8
b[0] = reg;
memcpy(&b[1],buf,len);
- deb_i2c("i2c wr %02x: ",reg);
- dbufout(buf,len,deb_i2c);
- deb_i2c("\n");
+ deb_i2c("i2c wr %02x:", reg);
+ dbufout(DBG_I2C, buf, len);
if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
@@ -116,8 +129,8 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l
__func__, state->config->demod_address, reg, err);
return -EREMOTEIO;
}
- deb_i2c("i2c rd %02x: ",reg);
- dbufout(buf,len,deb_i2c);
+ deb_i2c("i2c rd %02x:", reg);
+ dbufout(DBG_I2C, buf, len);
deb_i2c("\n");
return 0;
@@ -221,9 +234,8 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob
ob[1] = msgid;
memcpy(&ob[2],obuf,olen);
- deb_hab("hab snd: ");
- dbufout(ob,olen+2,deb_hab);
- deb_hab("\n");
+ deb_hab("hab snd:");
+ dbufout(DBG_HAB, ob, olen + 2);
if (mutex_lock_interruptible(&st->hab_mutex) < 0)
return -EAGAIN;
@@ -232,9 +244,8 @@ static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *ob
(ret = bcm3510_hab_get_response(st, ib, ilen+2)) < 0)
goto error;
- deb_hab("hab get: ");
- dbufout(ib,ilen+2,deb_hab);
- deb_hab("\n");
+ deb_hab("hab get:");
+ dbufout(DBG_HAB, ib, ilen + 2);
memcpy(ibuf,&ib[2],ilen);
error:
