]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
greybus: i2c: fix name conflict between function and struct: gb_i2c_transfer_request
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 22 Jan 2015 06:40:38 +0000 (12:10 +0530)
committerGreg Kroah-Hartman <greg@kroah.com>
Thu, 22 Jan 2015 13:15:39 +0000 (21:15 +0800)
'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>
drivers/staging/greybus/i2c.c

index 31528afe9533f7ce9e550e105facec97a616728f..0bcd7a9b0e123d7204c519386b2195c0222cf332 100644 (file)
@@ -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;