[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130212173414.GD7348@htj.dyndns.org>
Date: Tue, 12 Feb 2013 09:34:14 -0800
From: Tejun Heo <tj@...nel.org>
To: Wolfram Sang <w.sang@...gutronix.de>, akpm@...ux-foundation.org
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
linux-kernel@...r.kernel.org, Jean Delvare <khali@...ux-fr.org>,
linux-i2c@...r.kernel.org
Subject: [PATCH -mm] i2c: style cleanups after idr_alloc() conversion
Style cleanups suggested by Wolfram.
* s/res/id/ in i2c_add_numbered_adapter() so that it matches
i2c_add_adapter().
* Add a blank line before return in i2c_add_numbered_adapter().
This patch is purely cosmetic.
Signed-off-by: Tejun Heo <tj@...nel.org>
Cc: Wolfram Sang <w.sang@...gutronix.de>
---
drivers/i2c/i2c-core.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -935,16 +935,17 @@ out_list:
*/
int i2c_add_adapter(struct i2c_adapter *adapter)
{
- int res;
+ int id;
mutex_lock(&core_lock);
- res = idr_alloc(&i2c_adapter_idr, adapter,
- __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);
+ id = idr_alloc(&i2c_adapter_idr, adapter,
+ __i2c_first_dynamic_bus_num, 0, GFP_KERNEL);
mutex_unlock(&core_lock);
- if (res < 0)
- return res;
+ if (id < 0)
+ return id;
+
+ adapter->nr = id;
- adapter->nr = res;
return i2c_register_adapter(adapter);
}
EXPORT_SYMBOL(i2c_add_adapter);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists