diff options
author | Frank Seidel <frank@f-seidel.de> | 2009-03-28 16:34:42 -0400 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-03-28 16:34:42 -0400 |
commit | 154d22b04ae1741c5fcfd5d747b813a9a279abff (patch) | |
tree | c85164bc1ab821fb30c3949efd448e915741080a /drivers | |
parent | 94d78e180c0323422854bc1718e657ac2d0cac1b (diff) |
i2c: Add missing KERN_* constants to printks
According to kerneljanitors todo list all printk calls (beginning
a new line) should have an according KERN_* constant.
Those are the missing pieces here for the i2c subsystem.
Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pca-isa.c | 5 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-powermac.c | 3 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 9 |
4 files changed, 11 insertions, 8 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 65a769f3ae7..d31147e1077 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c | |||
@@ -61,7 +61,7 @@ static int i2c_debug; | |||
61 | 61 | ||
62 | static void i2c_start(struct i2c_algo_pcf_data *adap) | 62 | static void i2c_start(struct i2c_algo_pcf_data *adap) |
63 | { | 63 | { |
64 | DEBPROTO(printk("S ")); | 64 | DEBPROTO(printk(KERN_DEBUG "S ")); |
65 | set_pcf(adap, 1, I2C_PCF_START); | 65 | set_pcf(adap, 1, I2C_PCF_START); |
66 | } | 66 | } |
67 | 67 | ||
diff --git a/drivers/i2c/busses/i2c-pca-isa.c b/drivers/i2c/busses/i2c-pca-isa.c index 4aa8138cb0a..c420a7c0f3e 100644 --- a/drivers/i2c/busses/i2c-pca-isa.c +++ b/drivers/i2c/busses/i2c-pca-isa.c | |||
@@ -49,7 +49,8 @@ static void pca_isa_writebyte(void *pd, int reg, int val) | |||
49 | { | 49 | { |
50 | #ifdef DEBUG_IO | 50 | #ifdef DEBUG_IO |
51 | static char *names[] = { "T/O", "DAT", "ADR", "CON" }; | 51 | static char *names[] = { "T/O", "DAT", "ADR", "CON" }; |
52 | printk("*** write %s at %#lx <= %#04x\n", names[reg], base+reg, val); | 52 | printk(KERN_DEBUG "*** write %s at %#lx <= %#04x\n", names[reg], |
53 | base+reg, val); | ||
53 | #endif | 54 | #endif |
54 | outb(val, base+reg); | 55 | outb(val, base+reg); |
55 | } | 56 | } |
@@ -60,7 +61,7 @@ static int pca_isa_readbyte(void *pd, int reg) | |||
60 | #ifdef DEBUG_IO | 61 | #ifdef DEBUG_IO |
61 | { | 62 | { |
62 | static char *names[] = { "STA", "DAT", "ADR", "CON" }; | 63 | static char *names[] = { "STA", "DAT", "ADR", "CON" }; |
63 | printk("*** read %s => %#04x\n", names[reg], res); | 64 | printk(KERN_DEBUG "*** read %s => %#04x\n", names[reg], res); |
64 | } | 65 | } |
65 | #endif | 66 | #endif |
66 | return res; | 67 | return res; |
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index 60ca91745e5..3c9d71f6018 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c | |||
@@ -191,7 +191,8 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev) | |||
191 | i2c_set_adapdata(adapter, NULL); | 191 | i2c_set_adapdata(adapter, NULL); |
192 | /* We aren't that prepared to deal with this... */ | 192 | /* We aren't that prepared to deal with this... */ |
193 | if (rc) | 193 | if (rc) |
194 | printk("i2c-powermac.c: Failed to remove bus %s !\n", | 194 | printk(KERN_WARNING |
195 | "i2c-powermac.c: Failed to remove bus %s !\n", | ||
195 | adapter->name); | 196 | adapter->name); |
196 | platform_set_drvdata(dev, NULL); | 197 | platform_set_drvdata(dev, NULL); |
197 | kfree(adapter); | 198 | kfree(adapter); |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index bdb1f7510e9..c1405c8f6ba 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
@@ -210,11 +210,12 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id); | |||
210 | static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why) | 210 | static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why) |
211 | { | 211 | { |
212 | unsigned int i; | 212 | unsigned int i; |
213 | printk("i2c: error: %s\n", why); | 213 | printk(KERN_ERR "i2c: error: %s\n", why); |
214 | printk("i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n", | 214 | printk(KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n", |
215 | i2c->msg_num, i2c->msg_idx, i2c->msg_ptr); | 215 | i2c->msg_num, i2c->msg_idx, i2c->msg_ptr); |
216 | printk("i2c: ICR: %08x ISR: %08x\n" | 216 | printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n", |
217 | "i2c: log: ", readl(_ICR(i2c)), readl(_ISR(i2c))); | 217 | readl(_ICR(i2c)), readl(_ISR(i2c))); |
218 | printk(KERN_DEBUG "i2c: log: "); | ||
218 | for (i = 0; i < i2c->irqlogidx; i++) | 219 | for (i = 0; i < i2c->irqlogidx; i++) |
219 | printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]); | 220 | printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]); |
220 | printk("\n"); | 221 | printk("\n"); |