From: Viresh Kumar Date: Thu, 22 Jan 2015 06:40:38 +0000 (+0530) Subject: greybus: i2c: fix name conflict between function and struct: gb_i2c_transfer_request X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1708 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=62aadeeafa1585d6acf3e9b378eb554f57f3bc84;p=karo-tx-linux.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;