I2C pxa regression
Hi,
In linux-next, the commit named "i2c: Add missing KERN_* constants to printks", id 77130fc992cfdcce8c0a748a2daef16fc16e76bb, breaks compilation for pxa architectures.
I think that hunk should be amended :
Quoted 6 lines
drivers/i2c/busses/i2c-pxa.c +0
-0@@ -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)
drivers/i2c/busses/i2c-pxa.c static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id); · line 216
Quoted 10 lines
drivers/i2c/busses/i2c-pxa.c +3
-4{unsigned int i; -printk ("i2c: error: %s\n" , why); -printk ("i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n" , +printk (KERN_ERR "i2c: error: %s\n" , why); +printk (KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n" , i2c->msg_num, i2c->msg_idx, i2c->msg_ptr); -printk ("i2c: ICR: %08x ISR: %08x\n" -"i2c: log: " ,readl (_ICR (i2c)),readl (_ISR (i2c))); + printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n"
\-> a comma would be
welcome here.drivers/i2c/busses/i2c-pxa.c static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id); · line 221
Quoted 5 lines
drivers/i2c/busses/i2c-pxa.c +2
-0+ readl(_ICR(i2c)), readl(_ISR(i2c))); +printk (KERN_DEBUG "i2c: log: " );for (i =0 ; i < i2c->irqlogidx; i++)printk ("[%08x:%08x] " , i2c->isrlog[i], i2c->icrlog[i]);printk ("\n" );
Cheers.
--
Robert
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 18 lines · Robert Jarzmik
Hi,
In linux-next, the commit named "i2c: Add missing KERN_* constants to printks", id
77130fc992cfdcce8c0a748a2daef16fc16e76bb, breaks compilation for pxa architectures.I think that hunk should be amended :
Quoted 10 lines
drivers/i2c/busses/i2c-pxa.c +0
-2@@ -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) {unsigned int i; -printk ("i2c: error: %s\n" , why); - printk("i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n",
Quoted 8 lines
drivers/i2c/busses/i2c-pxa.c static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id); · line 216
Quoted 6 lines
drivers/i2c/busses/i2c-pxa.c +3
-2+printk (KERN_ERR "i2c: error: %s\n" , why); +printk (KERN_ERR "i2c: msg_num: %d msg_idx: %d msg_ptr: %d\n" , i2c->msg_num, i2c->msg_idx, i2c->msg_ptr); -printk ("i2c: ICR: %08x ISR: %08x\n" -"i2c: log: " ,readl (_ICR (i2c)),readl (_ISR (i2c))); + printk(KERN_ERR "i2c: ICR: %08x ISR: %08x\n"\-> a comma would be welcome here.
Correct, thanks for reporting. This is now fixed.
Quoted 5 lines
Quoted 5 lines
drivers/i2c/busses/i2c-pxa.c +2
-0+ readl(_ICR(i2c)), readl(_ISR(i2c))); +printk (KERN_DEBUG "i2c: log: " );for (i =0 ; i < i2c->irqlogidx; i++)printk ("[%08x:%08x] " , i2c->isrlog[i], i2c->icrlog[i]);printk ("\n" );
Signature · 1 line
Jean Delvare