From patchwork Tue Feb 12 17:34:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 219921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B68C92C0085 for ; Wed, 13 Feb 2013 04:34:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933369Ab3BLReU (ORCPT ); Tue, 12 Feb 2013 12:34:20 -0500 Received: from mail-da0-f49.google.com ([209.85.210.49]:35252 "EHLO mail-da0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933329Ab3BLReT (ORCPT ); Tue, 12 Feb 2013 12:34:19 -0500 Received: by mail-da0-f49.google.com with SMTP id t11so125568daj.8 for ; Tue, 12 Feb 2013 09:34:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=TXrlUczEAQ8ytwQUldC8m4cqd0WJQJ62JqcDG7HuevQ=; b=AsM2sSwRsE5QUxUjCPnWn6Z1352+LWsDHPmpOtKViuu8RrfKEzWhp75pBCzgEUNWAj UHhoTcn5L4EZOHGAYpfAHRQA1epmEXYH3iatLCPjEuw2dGFb7NuFSYIiFdH/Aohv8O6p fLs6PBPEKwLq1GVNnd4xD/QcUAIyYvUe/QhDXfk8KKs7S/cQpOG85LNEREAIFJUbSgQw lRESzlGZyXplP6yN6QTnG5bV96ZyjH9vzU74kHhzeHB1cOSUKVoStEu5mjecPl3/t3eB C345o7RVARCIX9JAqy0EIDG1rMAoeCRQdTdlXjzsn1GbR42+TalWmcd9WQ825T2CDK9W Tkuw== X-Received: by 10.66.87.8 with SMTP id t8mr54474747paz.28.1360690458994; Tue, 12 Feb 2013 09:34:18 -0800 (PST) Received: from htj.dyndns.org (c-69-181-251-227.hsd1.ca.comcast.net. [69.181.251.227]) by mx.google.com with ESMTPS id d1sm40115761paz.17.2013.02.12.09.34.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 09:34:17 -0800 (PST) Date: Tue, 12 Feb 2013 09:34:14 -0800 From: Tejun Heo To: Wolfram Sang , akpm@linux-foundation.org Cc: Mark Brown , linux-kernel@vger.kernel.org, Jean Delvare , linux-i2c@vger.kernel.org Subject: [PATCH -mm] i2c: style cleanups after idr_alloc() conversion Message-ID: <20130212173414.GD7348@htj.dyndns.org> References: <1360179649-22465-1-git-send-email-tj@kernel.org> <1360179649-22465-38-git-send-email-tj@kernel.org> <20130207152831.GA14797@sirena.org.uk> <20130207163247.GL2875@htj.dyndns.org> <20130207163958.GY4720@opensource.wolfsonmicro.com> <20130207165547.GO2875@htj.dyndns.org> <20130210114729.GB5472@nekote.pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130210114729.GB5472@nekote.pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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 Cc: Wolfram Sang Acked-by: Wolfram Sang --- drivers/i2c/i2c-core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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);