From: Holger Schurig Date: Mon, 11 Feb 2008 15:51:41 +0000 (+0100) Subject: [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c X-Git-Tag: v2.6.25-rc3~100^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6a7b5f84b5c15617010e06c95129fe8800e6b21;p=linux-2.6 [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c 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 Signed-off-by: Russell King --- diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 2598d29fd7..2b557bfd7f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -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");