Message ID | 1494137789-32395-2-git-send-email-peda@axentia.se |
---|---|
State | Accepted |
Headers | show
Return-Path: <linux-i2c-owner@vger.kernel.org> 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 3wLfPc3Y7fz9s80 for <incoming@patchwork.ozlabs.org>; Mon, 8 May 2017 07:47:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axentiatech.onmicrosoft.com header.i=@axentiatech.onmicrosoft.com header.b="RSMfX+Ow"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756104AbdEGVlS (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Sun, 7 May 2017 17:41:18 -0400 Received: from mail-db5eur01on0095.outbound.protection.outlook.com ([104.47.2.95]:48784 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755941AbdEGVlC (ORCPT <rfc822;linux-i2c@vger.kernel.org>); Sun, 7 May 2017 17:41:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentiatech.onmicrosoft.com; s=selector1-axentia-se; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uk4G1tIiyseYaJ30lzIEoDltowJ79mmoXv/dlQ2sRRM=; b=RSMfX+Ow4jnC55ecdFaYUR7Fl9MXbfaJ4tUiCoKmWfwDEETrtDA5tJzIcROI3bYZPr4DpgBHwKQeSaQ0NvoOUmXvPnMNZj8gkj13j3PKTp/ora/57ojIb4a+W3DCE6Iwp99NUu8n/uvf4eI3Ks2GUO7hAYlFxqIx2efc7Xj87Ks= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=axentia.se; Received: from localhost.localdomain (81.224.171.159) by AM5PR0202MB2548.eurprd02.prod.outlook.com (10.173.89.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Sun, 7 May 2017 06:14:06 +0000 From: Peter Rosin <peda@axentia.se> To: <linux-kernel@vger.kernel.org> CC: Peter Rosin <peda@axentia.se>, Wolfram Sang <wsa@the-dreams.de>, <linux-i2c@vger.kernel.org> Subject: [PATCH 2/2] i2c: mux: reg: rename label to indicate what it does Date: Sun, 7 May 2017 08:16:29 +0200 Message-ID: <1494137789-32395-2-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494137789-32395-1-git-send-email-peda@axentia.se> References: <1494137789-32395-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: VI1PR0802CA0024.eurprd08.prod.outlook.com (10.172.253.162) To AM5PR0202MB2548.eurprd02.prod.outlook.com (10.173.89.9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20184c02-0b0b-41b5-e827-08d495104503 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075); SRVR:AM5PR0202MB2548; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0202MB2548; 3:v4I/57JbjjWH3TrddkRRlyWsnEkmLnlajPDTtZtfIns2fvzdEeOPHFAAIb08m4nHXIWCUH8PE0n8pxsUtWvkvtQne+E9oSpNOJqk6zofAZF4iaaUD0mwKRLrNxCZkB+/k9ewPVeNmyNKwwtRZUtFIak1G4J5lpqmqScZueJ2vr+x0yhJV7TPfK/xxHzycNQ07UU6ijy1O3rF4RP61+ofj5rXEv/1eYooLz0b1SeWMbARzJNLppRQ1aBBfAcqPB/o6x0O3OIlJp+Jbioy7imPqBx91MXqSMZ6nD1rXeUnzK/jUQ5jHju/Svu07qSr4ydj; 25:WGO+JiQ2cBh8hb2XkhSj3/LjZaeYpqjPXukN7H4nyHI6UZUjGt1MUj+eL0NchQzK1UtZp6D6NIzPIHn3Fo9+NLjgr1Rvg01tD/l0TXD3rh+kXlqf8OzMhduB0hr3slYkl7lzc3vki+/AwP3U6gwZY7dKd88h6Wai+2rMqD8WXCaJJ038WJboTUE2hSSlpVC1Y12qPGeJLEJLauyd0oggzEqJ5sLLQD8dtoc7bmr5YaSJsruk5jB9+Jis4ZQ/dMjFnoj4VUhr03z5uX52cCVcQ+RbyntfWZMPiwiCNQacQl9jdrxQXD2zL4bIXFw3y3cJpPKiJCLw4lElqUljNNtQC7B57xV+xaa5GTyyXfwvjtVCzhn9zWuEY8NQz/vREAGn+TdSRfTRC8ftr0ymfLU+Nw0V6dYyvQztLcmNf4cK7K21iGg8zdsOpk0x/f8ay84LMhNaNDfed1KzcJ2lkQSAQRxx67eSsKkgxuLUEC4RQTI= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0202MB2548; 31:sR6A6Vx3bkhM01f64AnSS/p59NyGti1ilSUfWc25gqDHsImWdA+mpoHTef91/0RGWXk2mF6U4ONz3iloNP7T5U+M7guaHDQYOI9XOWlkMrY8N4sswahbRdX/7enzmCZZoW89Zy8lXyWgDyDzPHhGFhbJXCmtvNhyavRWfH7Bk0tSlsPEclMF+7B4WOsEx1ukxpBeJVPZG3nRgOnduVe4LWmBOkDKEd2sw5O29SG8XuU= X-Microsoft-Antispam-PRVS: <AM5PR0202MB254873264A338800B34AA9B9BCE90@AM5PR0202MB2548.eurprd02.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6041248)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(2016111802025)(20161123560025)(6043046)(6072148); SRVR:AM5PR0202MB2548; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0202MB2548; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0202MB2548; 4:ChuLIblY1RmKYvXe8uhJGdEcsQCJixVXZufAkyxDRYjXS+CwkD2Swl6fZkLUSgTqI9VieRwUj3kkgL30E3WOMlsvG3X7yUGNrjpIt65cpJThK16KT5ByXXgkFjDTet4OZgfNBd40t40Bu5pvxcUAKfQkqs4obwiRshOJmNhsNfvbkJwlpty9PS0sXYcRgIfP+MxRK9XZ7P0vOBDNgelsXrxV8GIIQfi2OSlL53JVGTwJIQPxHr/l0GGVssXCUrZ9DKH3mYhwSu0xUbIRI8JZAyClxwHUIQq+pBe91Xu8bPj/RB86h6Q9Ci5tkcM4i6lZ8RigAhDl0BkZ/6GXMDGkUR/+JZprmA1dz21SPvq7CAk53C3IT83lW7qyzWMa860fhHN/p3jZ5k56WzxJRDFVebO+tmWVV/3B+WLDwd43JFmIHmY6AucTSyLFd9IeRghxTv1eYG0wJta+wEZE3zPPHkR9J4EGEKTcQ5z1WDnDCOPe0Hzrt/KARQeC63LYu+dLkrPOVvEQbYj/iqrubadOz+goHkoBzIetspT0u6yNdTJkiO7xW3hmv8wxBUsuoYJeuBk0D3F2zPdU6sQ0SbaPIVsJLpH8xyW0uxBKoP4NnNrIY7eLP+dZfMXUbxY1DSS5SDAkhpYfmJBjmx5sCLFq58w6kgo4oJN4gp3Ug+eGb1bx/sn3UHdzXw3i7XZYosQlsZ3/wk/D/WBf8DJIur1rtA5PAHGwbv1dV3A6UgLhq0qMrbbIaHdwxbyitwaJHQe/12cxsgzKMkgA0wWoQSEGRrzF0OIVZ28f2R/64nAYvOFqox/sd4gh6mBXRU/BjjZiIlkCyK+jsSnUQBxJgJbcYg== X-Forefront-PRVS: 03008837BD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(39830400002)(39400400002)(39410400002)(39450400003)(2906002)(6116002)(3846002)(38730400002)(110136004)(36756003)(48376002)(50466002)(5003940100001)(305945005)(6512007)(53936002)(54906002)(4326008)(81166006)(8676002)(74482002)(76176999)(50986999)(50226002)(478600001)(86362001)(6506006)(42186005)(189998001)(2351001)(5660300001)(2950100002)(6916009)(47776003)(25786009)(33646002)(66066001)(6666003)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0202MB2548; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0202MB2548; 23:IQrekIyhNMLVBBnNS/gPLH9h2UhrTXnmTGTnc9O?= =?us-ascii?Q?ct02OP7ITdbcot3j0vyI5FkFlbvA+tH0A5dVlAZMvJuoE3HsTXfbwSHRObMc?= =?us-ascii?Q?Bs7mC7ABqAilt2zSRgHp21O2KRixpJoVxDZ1zT4YXBBLwsjdXse0J7Y++o64?= =?us-ascii?Q?bb9yj7tMPjsIYTSsjw3JDsRu1Qxj8V/ilxvoG3RZZ3jopu+Pe3vFdTh6K7IO?= =?us-ascii?Q?D0RwJq6sFeFPwU0nDsayocWXCfae5BlTv+jnGabh3y0eFDOKvn6STviHsf1f?= =?us-ascii?Q?qKxPyLHYYqZ3VmKCqu4dpvtEjiUMzFWkoLup3YMtJFSpoIwt808Gyg4m7kyN?= =?us-ascii?Q?wTIjYEs+2rmyVHCjQzXgMVKwWd093lI3/QpUVYLkWrT8Kb+9saOmXw3ldTdA?= =?us-ascii?Q?KFyLzDHWC8FvkcHt/+HtI8+BDWxRMngYnFLtQHsEiWNcsCFABUmSXkOO0Ehs?= =?us-ascii?Q?9unvb+lmAik1DlcZhR6P9K3mJtLoS2NjkSRW4wEq7cUj/0r5YRVnZxPchygN?= =?us-ascii?Q?/55CK5UIrOuTJpz4eLCiMQeNe00jzDufQZz/sB0/q/APVvWDUgY6ymTgixxq?= =?us-ascii?Q?eA///E27t0Rn9i4YUeeQb/CZja3/1Mw0vrmosvPzigeisYvMCpF8l8RWxWlb?= =?us-ascii?Q?lzc21p/6gQI+iOoyCd8YbA8cmPKMwbFrKXlc7tv/8FANqJ3qs/Z4Fbfj/7vI?= =?us-ascii?Q?t00vFH7z9VTtZuHHLBJGQ/XoNWOpENXoo8hZl9ShXDyhUclQ5YHb5xBZ7n3x?= =?us-ascii?Q?nSd0iMsltFIdwMbszttkPAnJHXXAlYC0Zrb27GikxjwJMy8omTV079EW1lFP?= =?us-ascii?Q?D8QStZdMz7E1cAOrmbbbEd5llWAPT6LoVO8euBXT2JxcDzk1jUbTZbeucLr9?= =?us-ascii?Q?nSb0nQcVR0VFNa6c4qKUghgcP2ZxXnh2FFzMJSAC/NLApVRKfoChY9Hwrsjd?= =?us-ascii?Q?Lzrd/S8Y1ekxF38fsMFj0jTC6+mBGySpnX1wvilQJQBUUOTG6Wd3UExPSTQ+?= =?us-ascii?Q?nizIXOuwi39vbNPEpnhH87FVwF8kDH6skCIt10qikZB/0cwoEZ5NhTPwQ8T6?= =?us-ascii?Q?zPo67ORU=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0202MB2548; 6:ABkFaHXIj7k1AkHdjx1guvS3ItGck29dP6JAe4/N1JoPiY4uwgHqo8lFUzvGJoBW/g3I/tEYDKtCoJjUsBX4RyD+cQcw2UjqsrwdfmApOSA3P4PKuP/7AGclKX3r4o3iXBjcS09C/kYiVliMBdO9eUnd+1yJVwoPuJkyAcZd/lDi9nzDAZkmfe0KjSUKAaqVupf7+x26ynpqLcUU5mrFAa6zvjv80MtWZpotAXM1SWOhsTvipLAbpxdxqTlT8kP9Jxst6mHIzfI0PRKyl0D2pnzDYXw7ZHoAjQbwT10iDmc/U2mqtPUd7kfE/SUJt3LrU3f8S9UwJUChdF0DDX3oBkQ0ogAMb2i6iOiU9OzYV14O/wPjT0MkV2G0v0+lMzqlpdtHPSUciK1pl2lumMinp6FhIyr/GGbhmEl2zxwJg2cV2wD+k10YIcRv5p1XTmmkf2wZHvw/ZJZSA+BhtVH77H1O1jQiFsHLNhjbQgOh7E1OYtYyRCr7dQscNuXDDZSieFLz4+gQXno8aSO7Ljmjxw==; 5:JpJ594JMCGLO6bryzPds3EklxX61W+g7Vd/0X1KazNR3jA44Mg5bybFD4pK8oX5QyfArbN/hqnLsOMm3fvkLpzbMuWf0Y5gMd00gIqfxyCTfGniTHg0VcizC+7xcSAzEfEdKCCYLn57lpWvlocFySQ==; 24:ECpg+ICL5idQvLQhpdiL6FHPGsCd+Ht2XDy+x8WYRZTH5db8+p7xWkgMPtZuHez/55z9RJ/5p/imfsgGctIgNoWUB2ZAO9jpA/IFkwtVKiY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0202MB2548; 7:3E3DZb6ZPMQshCE96ZKybB4AgB6Xbgr+bxUDIOL0iSJOvci/z5AtY105UrRIRspdLB1LB/82JmOFzvea4m8xgUGJAj+ZFteTWyDl8EXO07V4y+SQGASFNq8UTJvyohf6If0R9jp1phtOo2c/G2EQwmsi3dk1E140oT3jfWjTVcOIHJTKJb9oDrdx6FxAqPu+WzWrw1JvSnDNk7SVu9vyBCAulDP6Yl2yM1nBneiuz7BBVTB+gFSi2FR4usJJag6t/Ip5Mj25/mb52cjXDhpe7FdoilJHpwhw3KvMY5a0rUrsbGZFn7fqqAJC53UonDA/w1S18/HmFTRHuo1wCdxSLA== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2017 06:14:06.9856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2548 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: <linux-i2c.vger.kernel.org> X-Mailing-List: linux-i2c@vger.kernel.org |
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c index 91b10afc8c34..17026b3d39a2 100644 --- a/drivers/i2c/muxes/i2c-mux-reg.c +++ b/drivers/i2c/muxes/i2c-mux-reg.c @@ -229,7 +229,7 @@ static int i2c_mux_reg_probe(struct platform_device *pdev) ret = i2c_mux_add_adapter(muxc, nr, mux->data.values[i], class); if (ret) { dev_err(&pdev->dev, "Failed to add adapter %d\n", i); - goto add_adapter_failed; + goto err_del_mux_adapters; } } @@ -238,7 +238,7 @@ static int i2c_mux_reg_probe(struct platform_device *pdev) return 0; -add_adapter_failed: +err_del_mux_adapters: i2c_mux_del_adapters(muxc); err_put_parent: i2c_put_adapter(parent);
That maintains sanity if it is ever called from some other spot, and also makes the label names coherent. Signed-off-by: Peter Rosin <peda@axentia.se> --- drivers/i2c/muxes/i2c-mux-reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)