]> err.no Git - linux-2.6/commitdiff
[ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c
authorHolger Schurig <h.schurig@mn-solutions.de>
Mon, 11 Feb 2008 15:51:41 +0000 (16:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 17 Feb 2008 10:42:07 +0000 (10:42 +0000)
This fixes two warnings:

* unused static defined function decode_ICR() when
  compiled without CONFIG_I2C_PXA_SLAVE
* a sparse warning about a void function returning
  something

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/i2c/busses/i2c-pxa.c

index 2598d29fd7a426ada66139d60fb4d6308ae1103e..2b557bfd7f70853b21482427e6b3859d3c7f4425 100644 (file)
@@ -138,11 +138,13 @@ static const struct bits icr_bits[] = {
        PXA_BIT(ICR_UR,     "UR",               "ur"),
 };
 
+#ifdef CONFIG_I2C_PXA_SLAVE
 static void decode_ICR(unsigned int val)
 {
        decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);
        printk("\n");
 }
+#endif
 
 static unsigned int i2c_debug = DEBUG;
 
@@ -1122,7 +1124,7 @@ static int __init i2c_adap_pxa_init(void)
 
 static void i2c_adap_pxa_exit(void)
 {
-       return platform_driver_unregister(&i2c_pxa_driver);
+       platform_driver_unregister(&i2c_pxa_driver);
 }
 
 MODULE_LICENSE("GPL");