From f281f2dec14231b5da8ca44100b4e2887724e5fd Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Thu, 22 Jan 2015 12:42:39 +0530
Subject: [PATCH] greybus: i2c: fix name conflict between function and struct:
gb_i2c_transfer_response
'gb_i2c_transfer_response' is the name given to a function and a struct. Though
we don't get any compilation errors/warnings about it, but the names should be
unique.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
---
drivers/staging/greybus/i2c.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index ca8891413c0e0..31528afe9533f 100644
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -230,7 +230,7 @@ gb_i2c_transfer_request(struct gb_connection *connection,
return operation;
}
-static void gb_i2c_transfer_response(struct i2c_msg *msgs, u32 msg_count,
+static void gb_i2c_decode_response(struct i2c_msg *msgs, u32 msg_count,
struct gb_i2c_transfer_response *response)
{
struct i2c_msg *msg = msgs;
@@ -273,7 +273,7 @@ static int gb_i2c_transfer_operation(struct gb_i2c_device *gb_i2c_dev,
struct gb_i2c_transfer_response *response;
response = operation->response->payload;
- gb_i2c_transfer_response(msgs, msg_count, response);
+ gb_i2c_decode_response(msgs, msg_count, response);
ret = msg_count;
} else if (!gb_i2c_expected_transfer_error(ret)) {
pr_err("transfer operation failed (%d)\n", ret);
--
2.30.2