From: Wolfram Sang Date: Thu, 18 Jan 2018 12:11:31 +0000 (+0100) Subject: i2c: of: rename variable to meet expectations X-Git-Tag: v4.19~1263^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c49b0e077594b2cb5531eacd88664badb2635e7f;p=platform%2Fkernel%2Flinux-rpi.git i2c: of: rename variable to meet expectations 'result' is mostly used in the kernel as int for functions returning errno on failure. Here it is a pointer to the client struct, so let's call it this way (as the parent function does, too). Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index 5e2d55b3..4b573ee 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -25,7 +25,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, struct device_node *node) { - struct i2c_client *result; + struct i2c_client *client; struct i2c_board_info info = {}; struct dev_archdata dev_ad = {}; const __be32 *addr_be; @@ -73,13 +73,13 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, if (of_get_property(node, "wakeup-source", NULL)) info.flags |= I2C_CLIENT_WAKE; - result = i2c_new_device(adap, &info); - if (result == NULL) { + client = i2c_new_device(adap, &info); + if (!client) { dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node); of_node_put(node); return ERR_PTR(-EINVAL); } - return result; + return client; } void of_i2c_register_devices(struct i2c_adapter *adap)