提交 bac3e7c2 编写于 作者: F Frank Seidel 提交者: Jean Delvare

i2c: Adapt debug macros for KERN_* constants

According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the changes to the debug macros in the i2c subsystem
to meet this requirement. Also changing no-debug statements
to raw printks again.
Signed-off-by: NFrank Seidel <frank@f-seidel.de>
Signed-off-by: NJean Delvare <khali@linux-fr.org>
Tested-by: NWolfram Sang <w.sang@pengutronix.de>
上级 98a679ca
...@@ -27,9 +27,12 @@ ...@@ -27,9 +27,12 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-pca.h> #include <linux/i2c-algo-pca.h>
#define DEB1(fmt, args...) do { if (i2c_debug>=1) printk(fmt, ## args); } while(0) #define DEB1(fmt, args...) do { if (i2c_debug >= 1) \
#define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0) printk(KERN_DEBUG fmt, ## args); } while (0)
#define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0) #define DEB2(fmt, args...) do { if (i2c_debug >= 2) \
printk(KERN_DEBUG fmt, ## args); } while (0)
#define DEB3(fmt, args...) do { if (i2c_debug >= 3) \
printk(KERN_DEBUG fmt, ## args); } while (0)
static int i2c_debug; static int i2c_debug;
...@@ -313,7 +316,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap, ...@@ -313,7 +316,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
ret = curmsg; ret = curmsg;
out: out:
DEB1(KERN_CRIT "}}} transfered %d/%d messages. " DEB1("}}} transfered %d/%d messages. "
"status is %#04x. control is %#04x\n", "status is %#04x. control is %#04x\n",
curmsg, num, pca_status(adap), curmsg, num, pca_status(adap),
pca_get_con(adap)); pca_get_con(adap));
...@@ -347,7 +350,8 @@ static int pca_init(struct i2c_adapter *adap) ...@@ -347,7 +350,8 @@ static int pca_init(struct i2c_adapter *adap)
pca_reset(pca_data); pca_reset(pca_data);
clock = pca_clock(pca_data); clock = pca_clock(pca_data);
DEB1(KERN_INFO "%s: Clock frequency is %dkHz\n", adap->name, freqs[clock]); printk(KERN_INFO "%s: Clock frequency is %dkHz\n", adap->name,
freqs[clock]);
pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock); pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock);
udelay(500); /* 500 us for oscilator to stabilise */ udelay(500); /* 500 us for oscilator to stabilise */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册