From patchwork Fri Sep 23 19:46:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 674185 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 3sgkQP3ZWJz9t26 for ; Sat, 24 Sep 2016 05:46:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965835AbcIWTqd (ORCPT ); Fri, 23 Sep 2016 15:46:33 -0400 Received: from mout.web.de ([212.227.15.3]:60566 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030293AbcIWTqc (ORCPT ); Fri, 23 Sep 2016 15:46:32 -0400 Received: from [192.168.1.2] ([77.182.222.137]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0LiaAW-1bFI4W2bfQ-00cleu; Fri, 23 Sep 2016 21:46:28 +0200 Subject: [PATCH 3/4] i2c-dev: Rename jump labels in i2cdev_attach_adapter() To: linux-i2c@vger.kernel.org, Wolfram Sang References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <735c3aa5-0402-0e2b-1c6c-a5bfc17c9afd@users.sourceforge.net> Date: Fri, 23 Sep 2016 21:46:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:PBXQcSo45p5WXUpxrOE1flxnwhmEjwMc/+e05l/YZ/wnn05iOX3 kFUkCpmOFa391VZbFaSBZTzuJVBy8Y5HXeWr2FBB+p1l0wp4OPC4yaanG2Ef6jbxKOCaF0g gId7CmmrNeTR19d8KuNtHSlwH1vZKpQfPe8CuDT96KXO6QlYGh0lP1KzqHwYf35Hn7OFG6V Vz5bI7sw0zfzFIAgUpT3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:G9x82H2Ibu0=:2Aabt4PkZzrMSGsaITZcS+ Fqs2S/MRFfeaqTTzPNaubPwCLaxtwbAJOUsflObAV8Auuzq8rWIW7or79ovj4tjKFTLJOTPXR t0Q7obznkHzOn0gW2qTFzNwF7RE5XfjNVZsdntb/8ZqV7G+lR8opJM4OLkDqLoxh0ODIb8LsZ g462DQSEBZqUW89iV0XkRiYyPZyoKzOgR6UkRylPovOo5SYBMrG61CcUyxHUD0o1QS8DdVTyx Dqbviaeb4+encp/rvUg3/YvoQgsXIWO6feiQ7tT9m3no90k0MD3dsiUgX1h3CLI2qsM0Ytjal rQFWiX1sYPCh4mjixVgX7dPIITi+Gf1YY++y0GftX756e5OZ0augEr9QR3kI1zTt4eyhduzkr SjhFSvXMr8QVclRXgPLBzFNF72RTM8Qa6JwfD0foo3QjotKY8cTQlxI8LgqqFwOoAiQuXilMr P7hbQ4bTqgvbWwTQknxAh0hbppOZVYrXB/FRbKf06t52J7n2LwpL4rwK9Qk4P86SRJ/PFdZrY 4Tr0KgsW67uLMDx6Z1yWroOMt79PvcUEENuzPY+h287O5UAVmIgobyPq9V3MwIY9S64Xs/doT 00f2GhogcqOLrb287rFTUkdICV00yLBr7W6QRwqd2iAlyBiSov4+0rG0LchQk8pRgj+kQrQEN ZQxrPv2RpJvQnfrwZNH+ktNn0NAoYy6DiI/4GG/sepe1z8cbZ2DWjNoJLtJ6BSIDHKk/y/qax CYP4D+18HWHYeiy50nuGRxpaVnykSnUYYrHYgQlycYGho2terA3PuogLZ5VhVwXrBryuUYGs7 BuSDMK2 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Markus Elfring Date: Fri, 23 Sep 2016 21:21:39 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/i2c/i2c-dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index a6e35ce..7d3e3ca 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -555,7 +555,7 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy) i2c_dev->cdev.owner = THIS_MODULE; res = cdev_add(&i2c_dev->cdev, MKDEV(I2C_MAJOR, adap->nr), 1); if (res) - goto error_cdev; + goto put_i2c; /* register this i2c device with the driver core */ i2c_dev->dev = device_create(i2c_dev_class, &adap->dev, @@ -563,15 +563,15 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy) "i2c-%d", adap->nr); if (IS_ERR(i2c_dev->dev)) { res = PTR_ERR(i2c_dev->dev); - goto error; + goto delete_cdev; } pr_debug("i2c-dev: adapter [%s] registered as minor %d\n", adap->name, adap->nr); return 0; -error: +delete_cdev: cdev_del(&i2c_dev->cdev); -error_cdev: +put_i2c: put_i2c_dev(i2c_dev); return res; }