From: Trilok Soni <[EMAIL PROTECTED]>
Signed-off-by: Trilok Soni <[EMAIL PROTECTED]>
---
arch/arm/mach-davinci/i2c-client.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-davinci/i2c-client.c
b/arch/arm/mach-davinci/i2c-client.c
index c506ef6..41625e1 100644
--- a/arch/arm/mach-davinci/i2c-client.c
+++ b/arch/arm/mach-davinci/i2c-client.c
@@ -27,15 +27,15 @@
#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/clk.h>
+#include <linux/semaphore.h>
-#include <asm/semaphore.h>
#include <asm/arch/i2c-client.h>
static DEFINE_MUTEX(expander_lock);
static struct i2c_client *client_handle;
/* This function is used for internal initialization */
-int davinci_i2c_read(u8 size, u8 * val, u16 client_addr)
+int davinci_i2c_read(u8 size, u8 *val, u16 client_addr)
{
int err;
struct i2c_client *client = client_handle;
@@ -52,17 +52,15 @@ int davinci_i2c_read(u8 size, u8 * val, u16 client_addr)
err = i2c_transfer(client->adapter, msg, 1);
- if (err >= 0) {
+ if (err >= 0)
return 0;
- }
return err;
}
-
EXPORT_SYMBOL(davinci_i2c_read);
/* This function is used for internal initialization */
-int davinci_i2c_write(u8 size, u8 * val, u16 client_addr)
+int davinci_i2c_write(u8 size, u8 *val, u16 client_addr)
{
int err;
struct i2c_client *client = client_handle;
@@ -83,7 +81,6 @@ int davinci_i2c_write(u8 size, u8 * val, u16 client_addr)
return err;
}
-
EXPORT_SYMBOL(davinci_i2c_write);
static struct i2c_driver davinci_i2c_client_driver;
@@ -94,7 +91,8 @@ static int davinci_i2c_attach_client(struct i2c_adapter
*adap, int addr)
int err;
u8 data_to_u35 = 0xf6;
- if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+ client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
+ if (!client) {
err = -ENOMEM;
goto exit;
}
--
1.5.5
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
