summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/i2c.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2015-01-22 12:10:38 +0530
committerGreg Kroah-Hartman <greg@kroah.com>2015-01-22 21:15:39 +0800
commit62aadeeafa1585d6acf3e9b378eb554f57f3bc84 (patch)
tree6d9a52987041f8c669e6eb5fc9328b1146fe146d /drivers/staging/greybus/i2c.c
parentf281f2dec14231b5da8ca44100b4e2887724e5fd (diff)
greybus: i2c: fix name conflict between function and struct: gb_i2c_transfer_request
'gb_i2c_transfer_request' 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>
Diffstat (limited to 'drivers/staging/greybus/i2c.c')
-rw-r--r--drivers/staging/greybus/i2c.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/greybus/i2c.c b/drivers/staging/greybus/i2c.c
index 31528afe9533..0bcd7a9b0e12 100644
--- a/drivers/staging/greybus/i2c.c
+++ b/drivers/staging/greybus/i2c.c
@@ -163,8 +163,8 @@ gb_i2c_fill_transfer_op(struct gb_i2c_transfer_op *op, struct i2c_msg *msg)
}
static struct gb_operation *
-gb_i2c_transfer_request(struct gb_connection *connection,
- struct i2c_msg *msgs, u32 msg_count)
+gb_i2c_operation_create(struct gb_connection *connection,
+ struct i2c_msg *msgs, u32 msg_count)
{
struct gb_i2c_transfer_request *request;
struct gb_operation *operation;
@@ -264,7 +264,7 @@ static int gb_i2c_transfer_operation(struct gb_i2c_device *gb_i2c_dev,
struct gb_operation *operation;
int ret;
- operation = gb_i2c_transfer_request(connection, msgs, msg_count);
+ operation = gb_i2c_operation_create(connection, msgs, msg_count);
if (!operation)
return -ENOMEM;