Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d6a7b5f84b5c15617010e06c95129fe8800e6b21
Commit:     d6a7b5f84b5c15617010e06c95129fe8800e6b21
Parent:     59e8ce574445c5e7a65ec36f47a54803de704e96
Author:     Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 11 16:51:41 2008 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Feb 17 10:42:07 2008 +0000

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 drivers/i2c/busses/i2c-pxa.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 2598d29..2b557bf 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");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to