aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorHolger Schurig <h.schurig@mn-solutions.de>2008-02-11 10:51:41 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-17 05:42:07 -0500
commitd6a7b5f84b5c15617010e06c95129fe8800e6b21 (patch)
treeba6f175e85e70e2839b86fd714f687bb52d72e8e /drivers/i2c
parent59e8ce574445c5e7a65ec36f47a54803de704e96 (diff)
[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 <hs4233@mail.mn-solutions.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2598d29fd7a4..2b557bfd7f70 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[] = {
138 PXA_BIT(ICR_UR, "UR", "ur"), 138 PXA_BIT(ICR_UR, "UR", "ur"),
139}; 139};
140 140
141#ifdef CONFIG_I2C_PXA_SLAVE
141static void decode_ICR(unsigned int val) 142static void decode_ICR(unsigned int val)
142{ 143{
143 decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val); 144 decode_bits(KERN_DEBUG "ICR", icr_bits, ARRAY_SIZE(icr_bits), val);
144 printk("\n"); 145 printk("\n");
145} 146}
147#endif
146 148
147static unsigned int i2c_debug = DEBUG; 149static unsigned int i2c_debug = DEBUG;
148 150
@@ -1122,7 +1124,7 @@ static int __init i2c_adap_pxa_init(void)
1122 1124
1123static void i2c_adap_pxa_exit(void) 1125static void i2c_adap_pxa_exit(void)
1124{ 1126{
1125 return platform_driver_unregister(&i2c_pxa_driver); 1127 platform_driver_unregister(&i2c_pxa_driver);
1126} 1128}
1127 1129
1128MODULE_LICENSE("GPL"); 1130MODULE_LICENSE("GPL");