From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753275AbbJMXYH (ORCPT ); Tue, 13 Oct 2015 19:24:07 -0400 Received: from mail-by2on0147.outbound.protection.outlook.com ([207.46.100.147]:18021 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751865AbbJMXYC (ORCPT ); Tue, 13 Oct 2015 19:24:02 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none;freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; From: "J. German Rivera" To: , , , CC: , , , , , , , , , , , , "J. German Rivera" Subject: [PATCH 09/12] staging: fsl-mc: refactored error exit in allocator probe/remove Date: Tue, 13 Oct 2015 18:03:29 -0500 Message-ID: <1444777412-5401-10-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1444777412-5401-1-git-send-email-German.Rivera@freescale.com> References: <1444777412-5401-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD048;1:2O1VYyseUz/R1LSFvsfzDqNNm6vUJXrnroh0/jPYsRCmCaqJzHdGHkWTWtwV4+ZlvMPDh2C7B2wYPPOeCZ6J09Omt0ngEmxZtgybk0ALs/8XQ9VqSH04eAj4Faqn4mk3Y6yXme0n5wvUBsqRYZpyNPbVeMmHIROjHjkiPRMPcm5dpSISQNP7mCAilLhusgTdctYfDP8Ld2oao/frBw+GN+cgGA7CJ1Fggn6QGOXvG+QlwicxBTcO9asrexryWTA36tHcOiNky6OhtBKSKq8StJhJlbqWf8a1QURXZcDqkobIl0IJ8zLUN2JVdrZXAp/UlUwkegSzrq2qiAXtOaWUJ9KYSRVoQEgyuL7fh8rw6SBMrZJRIudDTPEZifYUbu9gLECxMWjj7cc9LKlTWmy3tw== X-Forefront-Antispam-Report: CIP:192.88.158.2;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(47776003)(2950100001)(48376002)(92566002)(2201001)(86362001)(50986999)(76176999)(50466002)(87936001)(36756003)(85426001)(64706001)(5001770100001)(97736004)(81156007)(5001920100001)(77096005)(5003940100001)(107886002)(5001960100002)(5007970100001)(11100500001)(189998001)(50226001)(5008740100001)(69596002)(19580395003)(19580405001)(229853001)(105606002)(104016004)(6806005)(106466001)(46102003)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR03MB507;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB507;2:Uyu/O7jqC64MV6Prw6Rj8q6mpF5LtN1Jm898Gk2fP3MynYJsV4EiuOv2cZgzeKG8ISZBi5TOge6Wb3GyVzj+NC36L5hBkzIfiVEp4X6v55UZdvOK0nEkqzZTT6Rv/qpEHkk9wxUjkfGzskuy+OaeE/j/0IIsCYMP9mAi/R5GM3c=;3:RuTvarUujZL9JHjsEl6cXdqsOiqmt7Qv+VHwe6UL4Gq+M4SgFvR/7ABNmFsCrIVQvRmKq8aCJhTIvUncMjf68IDfjPoJJUJBeWdw5F2LIu1yY3ibleXBe4jzniF0CWD0IKWNoGqJCozpkxJtH90NzHErhLu/98ejCKbGJRSAxbGosdlB2t+dyRJfIaMlQPrMnf5tZjw8pbQQvzolXEbHOxfgGYRbGL4+iox46IKhjwM=;25:ZlpVngia93Ikt8qkx5Lwza5ubGWKgAeo/vtyrc9UQmI8YmdYAaT3sG0hJpBkVhpo/Q7BFZoWs1FLpb+NVUChU+DuqqO+yDi0LNfzoo787qEh7ZCYeMvgW/HI30FrAWAYC+74KU0dl9ZdijjHtTl/1XzIx7tr9DpneKLMcIYwstN7SBZ0dr8OBwzp6UB1+XGvTr/OJGOULI1ppL8z5FqcJip8mDUbc8gJud0IFF0VURJ0JL64/2obv7zu/nM8GLADswDl7J+eIc+jApEp/UwbbQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB507; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB507;20:JaiTi9niu7Pu+BckFawyjFn5vgpeExzP7ifmXOomw4fhUZtpUmg7nJ8oqvL9/Cr0pR88OB2scxfvylDXWLOK2EhsRYFu6yRZTivU8ezzn8OdIMP8DqbSM+1W4caq61osnkRT7BDrnMgCMvW/NCBmVLXRUgrJXzY/77xf9quHM1XxZPf40E3klld6XpmrH+W1BgdY2WE+lO1w6izV5LEJsHRNxJBOZgEwfZK7uLD2MaVpqBpP2LmXBf+xA9jONhMNXB6H2cnzIot6CyDng9S1gIxsHpEzj87w6MHhHgK1PWnnTLPIkFmZDy5oT1NeEEX9JbEKLUaUg+tTKJ4Vpu9gO2J08ZFm52527RZ39nZ0ZGg=;4:PmX6XW0NZk4biNy6FnDPZSsOVKVq1j4L63gRVhHjKYXN8G05s57CHnnvkQFRXMFs8UiGWdf39tNFgcxC7CVF8yuKFJLiG/yegHpMtK3EhfCLF6v79Ir5LM/j9GbY5nmVGa+XObZEVgM0n0yCTmFxXDeMcrev5Z6sxLZlAKxjBzeW54hE6hOng7i+byw/ovDoExRXFtSr1a4IRESrQzoB4fprdCPlSNRkqSPgwTWPAa9BYTkTS6DInaAyN8ARCPVSgZzppmXXO8dNYbIL6RA65XKeNzfyA8IIxX6tNHqXinf4eF4pDsXsosABUJN2Xpub9IY7XZKu3BnjN4kSo9/NTDUR2nFCdEPxna9zZZDD4V4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001);SRVR:BY2PR03MB507;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB507; X-Forefront-PRVS: 07283408BE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB507;23:rR5az9UCVAtkuOLMZtOJa1k5k9x6EXzq+8SPfe4xa8?= =?us-ascii?Q?ru/Vct9IaThgdQpUhW1Kh6MmrQE5/p+h/JHylcxmKPFqCumH4FimS4wJu5oR?= =?us-ascii?Q?8VWjSq0oYlGb7yK65tD/8kMM9DOJ4Qwum7dCWOr0VuWatDoefKSqCtr4lAYi?= =?us-ascii?Q?Ocdcc7m8hsm/A6xZmNdMgub14zei8PwdYY2cbafueJMaWrKP9ly2+9N+9pqz?= =?us-ascii?Q?/dTafjtFLHu+CkpfncTNL3+HxUEM1QMDI2ZC9aYEKn5iICOGK+pfpOMXsnB/?= =?us-ascii?Q?pytRFz/2QPXdiINZXmxuky2PUMkfQfoY8Ud3Zdjx6P/XDN7DuB2il2DrWpIL?= =?us-ascii?Q?CXcsq/iMI+tHCI3q8T1lSk3OsWUFFx0eeHj5/eM/FXudxHfcBpIb2ikbVN0u?= =?us-ascii?Q?7Wzb7n3+w4SxPA1l1fpDfoF5DlT74hWeRd7IkCrGHnFb1I6hNzwXTcxBEQlq?= =?us-ascii?Q?Omv5YVHmPHGfyH7I20dfNzxyfbJBACKwjJh8KAheFxGpxNke3CizwFJ4Gfr4?= =?us-ascii?Q?zBIl4uLhrM2MQiDPzgDS052qQvN3n/lupjUlRGjXTaUqu9qOIShZjbITlJK/?= =?us-ascii?Q?RL8fi+ilv3xsF3KpPF+pJxs3QelCyaXkQV2M12osWMKr7CdpHucsc/45vh47?= =?us-ascii?Q?JpZU5d7ghyi61DmFAgwszfq48+RupMvRB/suK57NS7XPkT+li75/ARISqNQT?= =?us-ascii?Q?ItHsffY6Qx5JyUR4Q6bcNi3BYu+v3mcfH4i4LFmtFA9O8mAnDoqaLRykWS8G?= =?us-ascii?Q?jMKWluKyz1yKyXky9GXCRibXLVmLuG0LLX3TBzOJIXa102XtYme+xmpzLzNg?= =?us-ascii?Q?YW/c4J+b/Gt0hXl2rq2KAm6W2s1/xvGcmmB2HiBRSdyo1WefwHzvDoGh4iby?= =?us-ascii?Q?SmSk3i/+p/RQwfMLnqxidsM2dr5K9lHvvjpsPoMy0pbosbvDYTlOIEo1XPt+?= =?us-ascii?Q?3hZo91rCwAU8XyNH43HmZPkGXePWOC9jBEHykUGWIf4ijCzarH7LgJh7U+gJ?= =?us-ascii?Q?NdbqFLthTI+XRLBPIRCCXYjhiKZNUYOXUchN7zY/8Fh2DzMVDuJ8Ei06cq/C?= =?us-ascii?Q?8qrwZFdL4lQcYYe73qXX2k8yJXBBtEdm3rftGxc7V9HOiWKU5vttLDAv/yMC?= =?us-ascii?Q?NHDIxtKTCKkrp8AFQmgLzRz0IkPiG9/2X25pGklOolUjcdv68eQnnGKlfzQU?= =?us-ascii?Q?eD/pMi5LcTE0U=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB507;5:JpExX6q/udfSCucfY0L2V1qakmkSeFLtFihnd2NzaxC3LieYjpkoZ+xx5ebx3Rf5dW+wIgzs1pmQu3ZsKdCKQRJIfK/m/UyjGunrFNi29rIGbNRQphenGFISylfa0eyQBVwkd97FUkAuW/dfGPGPyA==;24:4brLNdf8FVuoEiJSNP34zwC1xWM123anIN8yb5cmKwNDRgQ/Rlq4wa3VkZA9RvJ48EpsFdDw1Hp4NyWxU8yL2WOnp0hbcfPagJ5jB4S8tDM=;20:b5wPJxy4xy8AMwVxqkr2U6+6n5PHWyU6pimxdwtodxIDDiFqWqC5NRJxAsqgWBsq5M1B47yNrG6CZwmEgS7RIw==;23:FzvpLNlyBV6bW84F+SJE6bHloLktGjUy+o5U0O0uYBp9hZta8xBqKprkqcBmgyiBC5bPFJgKq5Z/97Ucuz/mjEDJPD5wvO2hMl6Ki7PDS3A8RnqfRTABmmsOlffl3PhaMq16+/9sQvOJwib3oUb/XrKf1X3oGHFrYlyM6oQMRBq9c0LEAMkw7P6pT674KeLK X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2015 23:18:33.7619 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB507 X-OriginatorOrg: freescale.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replaced error gotos with direct returns in fsl_mc_allocator_probe() and fsl_mc_allocator_remove(), since the only error handling done in those functions is to exit. Signed-off-by: J. German Rivera --- drivers/staging/fsl-mc/bus/mc-allocator.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/mc-allocator.c b/drivers/staging/fsl-mc/bus/mc-allocator.c index e9c3dec..a45293b 100644 --- a/drivers/staging/fsl-mc/bus/mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/mc-allocator.c @@ -474,30 +474,27 @@ static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev) enum fsl_mc_pool_type pool_type; struct fsl_mc_device *mc_bus_dev; struct fsl_mc_bus *mc_bus; - int error = -EINVAL; + int error; if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type))) - goto error; + return -EINVAL; mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent); if (WARN_ON(mc_bus_dev->dev.bus != &fsl_mc_bus_type)) - goto error; + return -EINVAL; mc_bus = to_fsl_mc_bus(mc_bus_dev); error = object_type_to_pool_type(mc_dev->obj_desc.type, &pool_type); if (error < 0) - goto error; + return error; error = fsl_mc_resource_pool_add_device(mc_bus, pool_type, mc_dev); if (error < 0) - goto error; + return error; dev_dbg(&mc_dev->dev, "Allocatable MC object device bound to fsl_mc_allocator driver"); return 0; -error: - - return error; } /** @@ -506,22 +503,20 @@ error: */ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev) { - int error = -EINVAL; + int error; if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type))) - goto out; + return -EINVAL; if (mc_dev->resource) { error = fsl_mc_resource_pool_remove_device(mc_dev); if (error < 0) - goto out; + return error; } dev_dbg(&mc_dev->dev, "Allocatable MC object device unbound from fsl_mc_allocator driver"); - error = 0; -out: - return error; + return 0; } static const struct fsl_mc_device_match_id match_id_table[] = { -- 2.3.3