lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c: Add missing KERN_* constants to printks

Browse Source 
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>
This commit is contained in:
Frank Seidel
2009-03-28 21:34:42 +01:00
committed by Jean Delvare
parent 94d78e180c
commit 154d22b04a
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/algos/i2c-algo-pcf.c
View File

@@ -61,7 +61,7 @@ static int i2c_debug;
static void i2c_start(struct i2c_algo_pcf_data *adap) static void i2c_start(struct i2c_algo_pcf_data *adap)
{ {
DEBPROTO(printk("S ")); DEBPROTO(printk(KERN_DEBUG "S "));
set_pcf(adap, 1, I2C_PCF_START); set_pcf(adap, 1, I2C_PCF_START);
} }

5
drivers/i2c/busses/i2c-pca-isa.c
View File

@@ -49,7 +49,8 @@ static void pca_isa_writebyte(void *pd, int reg, int val)
{ {
#ifdef DEBUG_IO #ifdef DEBUG_IO
static char *names[] = { "T/O", "DAT", "ADR", "CON" }; static char *names[] = { "T/O", "DAT", "ADR", "CON" };
printk("*** write %s at %#lx <= %#04x\n", names[reg], base+reg, val); printk(KERN_DEBUG "*** write %s at %#lx <= %#04x\n", names[reg],
base+reg, val);
#endif #endif
outb(val, base+reg); outb(val, base+reg);
} }
@@ -60,7 +61,7 @@ static int pca_isa_readbyte(void *pd, int reg)
#ifdef DEBUG_IO #ifdef DEBUG_IO
{ {
static char *names[] = { "STA", "DAT", "ADR", "CON" }; static char *names[] = { "STA", "DAT", "ADR", "CON" };
printk("*** read %s => %#04x\n", names[reg], res); printk(KERN_DEBUG "*** read %s => %#04x\n", names[reg], res);
} }
#endif #endif
return res; return res;

3
drivers/i2c/busses/i2c-powermac.c
View File

@@ -191,7 +191,8 @@ static int __devexit i2c_powermac_remove(struct platform_device *dev)
i2c_set_adapdata(adapter, NULL); i2c_set_adapdata(adapter, NULL);
/* We aren't that prepared to deal with this... */ /* We aren't that prepared to deal with this... */
if (rc) if (rc)
printk("i2c-powermac.c: Failed to remove bus %s !\n", printk(KERN_WARNING
"i2c-powermac.c: Failed to remove bus %s !\n",
adapter->name); adapter->name);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
kfree(adapter); kfree(adapter);

9
drivers/i2c/busses/i2c-pxa.c
View File

@@ -210,11 +210,12 @@ static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);
static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why) static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
{ {
unsigned int i; unsigned int i;
printk("i2c: error: %s\n", why); printk(KERN_ERR "i2c: error: %s\n", why);
printk("i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n", printk(KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n",
i2c->msg_num, i2c->msg_idx, i2c->msg_ptr); i2c->msg_num, i2c->msg_idx, i2c->msg_ptr);
printk("i2c: ICR: %08x ISR: %08x\n" printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n",
"i2c: log: ", readl(_ICR(i2c)), readl(_ISR(i2c))); readl(_ICR(i2c)), readl(_ISR(i2c)));
printk(KERN_DEBUG "i2c: log: ");
for (i = 0; i < i2c->irqlogidx; i++) for (i = 0; i < i2c->irqlogidx; i++)
printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]); printk("[%08x:%08x] ", i2c->isrlog[i], i2c->icrlog[i]);
printk("\n"); printk("\n");