From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759049AbdENQii (ORCPT ); Sun, 14 May 2017 12:38:38 -0400 Received: from mail-ve1eur01on0116.outbound.protection.outlook.com ([104.47.1.116]:17942 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753765AbdENQif (ORCPT ); Sun, 14 May 2017 12:38:35 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=axentia.se; From: Peter Rosin To: CC: Peter Rosin , Wolfram Sang , Subject: [PATCH] i2c: mux: only print failure message on error Date: Sun, 14 May 2017 18:41:13 +0200 Message-ID: <1494780073-13713-1-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [81.224.171.159] X-ClientProxiedBy: DB6PR07CA0018.eurprd07.prod.outlook.com (10.175.239.28) To AM5PR0202MB2545.eurprd02.prod.outlook.com (10.173.88.151) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fecf1513-2c02-4243-808d-08d49ae7a8eb X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AM5PR0202MB2545; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;3:XfKZO7FQZfxIj2om8S3st3OlHl6fERq0DUZWUSccmQ2y/fusnJ3Hb8h6qyhdv1VwFllETWgXYP0phwZBiVdFoNXAbYGji94nFmSNj730I3KVglwr+oySnr1mjX5U+1VpjdqxPO0RMymyXTfUxtz0pcjr60M8qvtVP8PC3vy8aDWpE0Dl2vTdpzSwVU1H74ZUl2FcQrUeOyr7TyRIElPlp1YFIOoJLfmbrRK9a2VclwHGYkP0KCwLRnbfbcyXBhEDlcdSnUkdWB8lQ7GmCbdZNZ5bfFyd0bIca9+m2TMzM8s8yLz6UzWuJT0edTtBcg7h;25:mPL22BgZ2Xg56whm5PScMTL4ggzL1Xg1zI+h6/p6QmXwTiRcQtL7mp7ZhRVoV/UmkrWLuUcEfbaEY504hGS222W+cBm1XBT34pLBTlymTaBsChZK4eiCyGcKG1g26Hsg4lP5jnEF1XVtBHRyDHazuNY6rRfiBmnwZdcRqMdNTWZbp364i8y/yWqkn3+pjtJNTcBb4vlJ7N+2vE7y1blmD2S72saRI3LmXWKHbIb+7v79reM7IJ1Rc54Z18oLZx+jYoOFADhAN0nz94inrMtlck+pH1br3t63SZkb7FnPdtG0Vqyl6YmERp+LKgtM0s6srlOC80mf9JR+IHkdLOVve0Z39eheORhTN/oA1Ka8hx0kQV/9vCs4ZX91C7CiKY+734s0Vg56Ast7e7iUEB+E3l86xmUQ9qjcGkdusD26k6ikzuUh1SfmxKT2I48cThHk5Y0KbEDyY7xW1RBk5yo390VQ921drGKBUTANlS4oHlc= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;31:xpRLNoxNLrdAaZYILj2N8NGsStpktZCl7yyBhOPLcKi7J0OaJ/WGBfMGVxTgWm6y+YPwAdRsXrpnI59JSjsOhUNIgYCBkh2Qk5XF2Qnp9l5pEoeU/OYRMiDAFsHvcvIAKUleNiMRRgczdyMbGJVFkmNK6+hK3tNUt7ROPtNWSQIgzMKvYqxW9B9o+YgwbyYLr8XDeFDUlBxQd5AY8j00lXW7yiVWU+dTvf60CLqS2tU= X-Microsoft-Antispam-PRVS: 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)(20161123564025)(2016111802025)(201703131423075)(201703061421075)(20161123560025)(20161123558100)(20161123555025)(20161123562025)(6072148)(6043046);SRVR:AM5PR0202MB2545;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0202MB2545; X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;4:02WU/kMduw8S8zc2vhzdtSfpFB8dZT6yJPoGG5Db6EqBft54AehYGyckUoXJGZMO5hgqkT32MGkUGrWdr8Mxk/h6XoL2iyIyQTRHYYNgbou2asnMvGeihaAb0X2W6TPnCCWtadugnoZJ7xZLc8MDHNKPBmi3AygYIfX1Cavo4vS1feFt81T9SnU81vUqz1ajlGibOSzRvc+JcVFGoW5sc+sUxD4oMxRkcZTlYLIFgdaEEDiHiIhAuQBuXpmy3TnNIPnrYcB7juFvXjFsXDM1RSSD/zyWHOQwP1iXNGByIh0QZ7Ku5px9AV8ZGT/mIAGoQhyYND3BohlgEtPwJJZwqMMLI02uQSwDbx8Y3wCdsdIm4DFPF8weIPtKYpNtgLrbR2qpa624Q2Dk5rYae8xxhEU4qnX8WWVJ+NtL8hN33t06WbUgb3b/nR6pmbJ53BhTNraORAcpq87wUjq9aJQMlUVPt9JofxWtiXsj/xAADP7RvG3V+nn/OKo8WJoLlosJLMvGROiwNMj+PCYgxygwU2mxrzfM0CIrVbH1YEJZj/WEeGNjAN0vbmGMXegEttubdetLDtgnj6IuUImPdIiaiPUnWynRRzvoGRVi/siVFZRt03IfTCMNNXg22EqETnTs9kQBvcUKLATT+MKdb9Su8uze6AQSCAlXfjqR3HZ2MTwDlSuaYueA5nS6NTn0okP+3aMxNniPy46+CwIloQy7OKmyiMjYxKoDfnlosWYHwUYUTPWE/o762Y+eWnTQ/Yx9ofnzPPREj2+1VlF/kDsXHQ== X-Forefront-PRVS: 03077579FF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(39450400003)(39400400002)(5660300001)(50466002)(54906002)(2906002)(6666003)(6916009)(47776003)(38730400002)(66066001)(110136004)(50986999)(53936002)(48376002)(15650500001)(6512007)(50226002)(81166006)(8676002)(4326008)(3846002)(6116002)(33646002)(2351001)(189998001)(42186005)(7736002)(305945005)(74482002)(6506006)(25786009)(36756003)(508600001)(6486002)(86362001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM5PR0202MB2545;H:orc.lan;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM5PR0202MB2545;23:pwVFH9E0gQej0ckLbJ12LbglNrRYLYrpW5nXT6s?= =?us-ascii?Q?32c79RPvCl0VUGATUnSiFxMGzgVYedUie+Q2s/PCYk74Z+fW2FtgBcRSDPHV?= =?us-ascii?Q?H2UNKtVz8m8foGsrNid2aqOlsPB2UauqjLylfvOU0kU/8m/99oiBFg+1IiyF?= =?us-ascii?Q?bCJmcy8/txjrWjwK+BeUUul07f/jI4yExMrJ9poTBl+l3UQBfYbCb0YvVWJP?= =?us-ascii?Q?Ja0K4O66DZij49Zq5QPA2TPT3hiqvLQE0rYqP20HzGapWAGpDYPYqhf20+BV?= =?us-ascii?Q?JGqmJEo+6hfG1K+k1LMHRZnk8al9BOJ48wcfOhkJxon6Stb3lmXzLuf+169r?= =?us-ascii?Q?RhGxBY252tA1vOYi+6Nyth4myzeFJKbiK77UJ3RArY5pJE5OclJZrgI73CMX?= =?us-ascii?Q?VzpWxw5uGYnck3k0hMFFMEBASQ27CIHhZLs5jv2YiW8eLv0X8DbYpBv/+63I?= =?us-ascii?Q?u2qEh/8LLKE7dTWwbDm93Gdhj1t/QlLDed2/8zhc+qZK0vIkLC/TK39bCUdw?= =?us-ascii?Q?eQZfWNPpK0Jhn7IKObkWAgQFuPQNBaxeYoAaAj1IlgYhoB7RW1kYPbqzdlY8?= =?us-ascii?Q?YP+/GFcTGeNCgNAZFm2zPhBQDI577RYUMXnZooo/4rmekjX7IncxH0035kVQ?= =?us-ascii?Q?bODbkx/GhfdZ0B6FNTsV4eKG6lxK3dKJ3jquxFi7W2/R8Ftf1SlYMunnStvz?= =?us-ascii?Q?ONX0j2bYciN3UEtuS6ceP13qZO8r6mp0uGEuTf1Ku1SEpy/Orf294mT+iPhN?= =?us-ascii?Q?r8VKZVaSNbeQvYFH44TdJXrKbN2uSxFUYVpM0EKTnboCs3Jmr09lmHQQwWcC?= =?us-ascii?Q?MGtmQnkgjJUiTSdNyF5/2FcsZMMGEztN0O7Lwo3mPltzlAQk/HfffVFl+cPk?= =?us-ascii?Q?OEPL9nVcVpJMyUrHG/LL+koZd7Hioh1XeDLmwS+DMZdM6bN9GAzeWOAzfUPR?= =?us-ascii?Q?MPZMyDtvI9DM9N+zDwhJ85fr7yrrbRvEtyRxuC0vsuw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;6:H8Z02h6Y8jGPsRO6G3zAkYEgNWqCyIf2TpPfmXMMSPbESOddgEARGaSDcVD+7Wamds7uK7aMHf6z2db3QiaR+mMpTP4lZg0UELxbZR1+dtqkIcJNOrguMGFv5oHuHzhIBVQbRsPaLOG4jkdLnon7xNpYSxVwaErF/WpLuOvyRlhZD2DDxVLptFKxU+/iGGDMiWWANOtLX+42m54i8dO0oDbLuC+5tTr17BmngXUeBtGDp1K4VFmEqXRvBxkJXnQKjXHJ34RuiD2pvz79r7qaYcWSc6xOckntiWFpngl+0aeas4sN8HqaKbS0I7/SVv6nHyw5Ie2Zz1jC/k4PikbxKpDB2Mj8ggWBfM8Qxy3uTk5Hd4LB7Vm+nej8TOj9hgKEH4Y3LNYZ625UVeT3x5oQS8XrYKSe+NTxrDFeVdmj+ednD6YBWVI02xGbuOu/HThW716P0l99HaBxzkAgwbT1OCuyi157d07deYlnGLlPFEpUZ4AKVvv+nu/9naMc3qhN0i9Ow4snXJ74J9dn0jnaYg==;5:JTdz+WbdXd+g9xseYBzd4TyLj3xBDVziuKPD6YHYXN8wt2ADnmiQuEdEKiZuJ3h9JWqN42JqMHbduwoMeLRYD+2dr/4O+xLnI6/yJ02j3jMYd43WdftjkQ7a7OlSCoVcMdmzODXuCkpv6CxbBeLShQ==;24:R5OO8+AUy0Y+1qPUQ5wYvieGTp2BrbYYjwyAJ5Uj63IShdeDaM0JgKGp1mZmsskVGRL1R13Q/DN0XsHP3hrftSzVVlpAenaByfcQ3YSKNSM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM5PR0202MB2545;7:W6DZ8Iwbj0b5UuE8A78LnoFgLOQ4Jy1buqw3PyJOGoebwqZY8PMZPG8zdkGFAFqclx/B+JLapBHjWs6Uzrge5blDadK9y9/o6a1JcJDprsx7DnIs7wBe5V1AKeEdphh2/mqbnIrP/dX+zSgFUhb3P03iqwInquOekDVsS5OL2PEWp47KNNL3F62eRA0GY9y6JBAOwniNEgt9O5+el5HeZNEFxCPnZ9A7jLQLf99LzrTtgQv10xUUKTwMDRwlcWyp/aeMYwZbfkgpBfA+AH/KNGrC8Rz9+RHX24SqAYaoeIMekuCE9P3dSyodjzvDiwyEzAgV4JOov+eX8GgGMe1+0w== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2017 16:38:32.1536 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0202MB2545 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As is, a failure message is printed unconditionally, which is confusing. And noisy. Fixes: 8d4d159f25a7 ("i2c: mux: provide more info on failure in i2c_mux_add_adapter") Signed-off-by: Peter Rosin --- drivers/i2c/i2c-mux.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 26f7237558ba..ccf2ce1836c8 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -395,18 +395,22 @@ int i2c_mux_add_adapter(struct i2c_mux_core *muxc, if (force_nr) { priv->adap.nr = force_nr; ret = i2c_add_numbered_adapter(&priv->adap); - dev_err(&parent->dev, - "failed to add mux-adapter %u as bus %u (error=%d)\n", - chan_id, force_nr, ret); + if (ret < 0) { + dev_err(&parent->dev, + "failed to add mux-adapter %u as bus %u (error=%d)\n", + chan_id, force_nr, ret); + kfree(priv); + return ret; + } } else { ret = i2c_add_adapter(&priv->adap); - dev_err(&parent->dev, - "failed to add mux-adapter %u (error=%d)\n", - chan_id, ret); - } - if (ret < 0) { - kfree(priv); - return ret; + if (ret < 0) { + dev_err(&parent->dev, + "failed to add mux-adapter %u (error=%d)\n", + chan_id, ret); + kfree(priv); + return ret; + } } WARN(sysfs_create_link(&priv->adap.dev.kobj, &muxc->dev->kobj, -- 2.1.4