From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754538AbbJNUHD (ORCPT ); Wed, 14 Oct 2015 16:07:03 -0400 Received: from mail-by2on0107.outbound.protection.outlook.com ([207.46.100.107]:61566 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753806AbbJNUGz (ORCPT ); Wed, 14 Oct 2015 16:06:55 -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 v2 09/12] staging: fsl-mc: refactored error exit in allocator probe/remove Date: Wed, 14 Oct 2015 14:51:48 -0500 Message-ID: <1444852311-673-10-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1444852311-673-1-git-send-email-German.Rivera@freescale.com> References: <1444852311-673-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD022;1:fsrRKhAZoxYdef9ktAO4q5FYkWSc8/OCT/PVgGm+WRxFvRabD9cL1S3KqnpZ9D+GDBMIRwVrAFDBWMlpuJq+JlkJK5xe3GwtSh3Ggw+MY4V4rX0dHCOWOtpP2cW7XwsEE9gukzBpa8nE+XlYGahsSHTek2gnjhyUKNzNf2faCeub2BdpWjhRiy79upgGKovSG8BhtOGwwWelqbHE3bZ2UcZnj0Ph11OXmSFT50TfPcCYI2CE8mlnnatd+rdjJJ2XaAKnClvUEm+tCTjN+qLQcbsb9imyCdcppG3feXaKvwQ5RwKQQeeNfCdnlot2eaAItQ/GZa/fqXms2wbTmEnAV7uqslWh50hvU4CtMTEVjSDm+Fo9+aiW0CXLPPw5eRg9OSxoS3m2Sm7r4xhvjWruKg== 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)(229853001)(2950100001)(47776003)(2201001)(76176999)(92566002)(48376002)(50466002)(50986999)(87936001)(36756003)(64706001)(85426001)(86362001)(5007970100001)(5001920100001)(77096005)(97736004)(81156007)(5001770100001)(189998001)(107886002)(5003940100001)(11100500001)(5001960100002)(105606002)(46102003)(50226001)(69596002)(5008740100001)(19580405001)(19580395003)(6806005)(104016004)(106466001)(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:SmHJWpZtkeViBxpMQ1gz2z7gOtqG7MoVdnRqmJslDXLVK7aYJF+JZHwbk1Pl/6nPamBaMYG+v1GnRc+jHgL7dvtnyNeoXQ/PlgLl83FsOhlGM9bP6k8J7P2Vr+lVEh9wPqK+mfqwpscbYtocKr0l45ghRZ5sXMnuLdCBT943Kz8=;3:LE7M/n+W25QCuMm2CvNbzJMBPLmWP7JyQGiz8QDzYjMw9tuI4yjBl9mSkJxpVjBBjKpJWHbwErs0FjIPp8/ti668NHIB5hIFIoJ/PZOmhYeDhTqBTBAUgZM8qGcvrVXsyjog0PHf8inSFDdpl7e9icuBaL50DHBtPaCie+Vqe1vk4yvJnjFGUC34oLqfpnXLzYgBIqjGHeDuNUjjoYBC6/rIi1Ws1il3dtELCU8EbxE=;25:ipITTXzxmBUBMOXFy/FjKGEt1EF8Oo4mfFdrIA/1iySE2wFW9uchGq9aK2Apc6uDKIiAYYM1rIBoySHan3cnhYW0oa5jheFmtt8S5RzvgKjnqMXlXPRo/ONfpyIPaCHNlXNVV81BdVlULm14RZsHh12VdjSiII+9tgblU9PG319T6Wd+pJKiYlX5VWYkATUfA9AOW0CO5EtfLvgL1JhdVqSjL7TzS7BdLAZVMC/DigwoBihDSq5JUFqXQgkNgeWJSCDCfhJOSiEirGMLqVxQmA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB507; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB507;20:iscbpjaKqJ3vV6ue5i0F4+NqEjWighlj5naOAwi8OD2rfcEUv+1K3MiL3VRx9a14m1yHUgjE+umApKfhlUM0MPZ63GuhWmhtFPWq1Z2w5lZVYBY9Hu00azoJJ7Iwo+aLf6h90HFX+ftuVbs8BHQTStR0MQp7FddFq8dojA09p2i2w+4M2s+J+efTMVaL6enDDBipI3husQ3giKSXuQn0tpaQILbgz4q06MAIVCECmqj5m4NCjFIkGqZKbYxG2cD/DOPtDH6sH91J3isnCAY+ctinyNrI0zsSWpIjZLL0pG9bocfrMYhwf+M7rkHhbqrx3EN44SEvVKPojKmoE5epYZQfsYnphZuH+mSR9IFouPE=;4:TivwxvpDpQAqjoiv3y40SWYqfASYSFyKMjfHmqwO2+ZgfYYkkah9VDrpmXv4KZ2iD1DCCUgeNd6l4ZLxEQ79LlX0kYfgGLw/P/ap9/NLEUbUJUnM5rZyZsrztYHRvCN8p16bL/8P7l6Q4s722YkkTQ2sc0cQxt5mjx9mjmMwwp3GRIybMuOgKE6IkuSnWtOLQ9kDmStBQ2YB4dZ+lHZSK3wXD8BEK0IUWpgPBXY2DdO9Fg/h19zKtfhnXtHlQbnHRjzN+LuhM+CN4AII6yWEVT8K33PatK7LrMWjrQS6Fu27nfxCTCpsh7SfkHuLi7A3x2Bvq31vPF4d5SDMXs7jN1g9FWhRsz7MLPDWANx3gAE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001);SRVR:BY2PR03MB507;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB507; X-Forefront-PRVS: 0729050452 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB507;23:UcPulZC3a6EiXM5SxeSo1JumGrLLMe69FPeV8MNJAV?= =?us-ascii?Q?paQ2ijcGiaeYYWq6LAHl/wWNG7tSv45VAEiVqcJOZwky7keA8/Tf+d/5phSl?= =?us-ascii?Q?VDPHrkRnGqerAokZkQXRhHzoTScL5G1gHHjkZYSSVMU2Y+6n989vV3XdAM4o?= =?us-ascii?Q?CwzunhhIsdt2DLoX91RD3W8WfSEW7fSCP4QePGqALWo7SLogsF2hRahEssNn?= =?us-ascii?Q?Zu/ldeIWnTbjDa1mBfN9D3myKWL2EcMiq/f/D2ifyOiQRXrkKqNf5pSjU2t4?= =?us-ascii?Q?DItHZbFPEJ0njYZrrGVA4PvnRbFGYfgLBMnu63xf4Vl/bIq3rGM09/7T6X+L?= =?us-ascii?Q?5rBeK6pQI/76vTiBbr/oF2BHjzUQgFA6k5PO+M0Tqqll+Zt2Hb+B9RlDxpNs?= =?us-ascii?Q?TGYRoUvEqDcI/+QavTffxiHB5qEs5UocFbGZ6KvwIKYT0BS65Je/yZ7HtCeg?= =?us-ascii?Q?+q/ZjhwGV2ygVHyFgg8Q83TC7ieKLvPIaJ9ZNsLlYsfJRKjLJ5SkDHNEwDZB?= =?us-ascii?Q?Bs6V+boUXn00xOnjOz1oB3zSZcv//diIpO8PzipdPKyURBm5dbNu9pQxXDIo?= =?us-ascii?Q?JAsrBOJEgLHfzZEpxhgvU3tyQ+wDqVSqdrMRKq0YAHs4iwt5FDBAx787cdxX?= =?us-ascii?Q?HkIOPW+M4Bi4eEqQtLnU+/e0TwxC6xymxu+J3Qrm7uE/EO/EOYJVXkNibEfA?= =?us-ascii?Q?5qCiwj89XOBcKLNpL9mWfO4+OkMTeQiGzxBQUMWJmovdQUQHrc4X1YfpwJPz?= =?us-ascii?Q?+8nK3SCwHdW8uswKpOSWfLPO9VvDaYiAqaR1B/vIOfXaTvHVRWww2HNvpf7Y?= =?us-ascii?Q?JpC4vldFf72/FVU93LWM3ao9knJfFCVeoctNUPhH7P5MEVCnbpEtAeDPIst0?= =?us-ascii?Q?bwXKkbbkNj8avHU9aGxvpmscn7zp7VxpC8PIKbVCeDCiJb0Uw9p+9bUrOqCN?= =?us-ascii?Q?7qsJ0UAGYCffxK2gc8WuUOB5Xp++QvSdE/Eqby/f9LyFONKaPTWH+ZGIVC+h?= =?us-ascii?Q?fLjTL3XH5pQgbJ9iRu0WfK+s56fIVFtHhbX4pwlizIQTk4+48iy+FxQzIVIU?= =?us-ascii?Q?smJZGTu0AtsAZJDmBPaa4Dp6gaHcGFssI0fpD3UfmOWjVcl0Gezg3MDiOfN4?= =?us-ascii?Q?k5+JujiewhCTIa5fvabJofjxfF7v5mAvIQsH0n4quNndFldz727hVU1QSn/a?= =?us-ascii?Q?/J8gamZwLr9Ss=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB507;5:2LSJ/GRRHfkOaU1g2HlG9Ym6OR23dbEPYHI5hhb02CZ4pAQT/cFumq9BPirxgYD0G6JgoPJb79XZkqvo2tagl3TjUGTuav/AOvNnuq3CwydUfUj8/QCx+dUvXZqOzyzz+TN6qpO4O+A6J8EuTu+75g==;24:7s/mDgxtIY3ckMhrjDme5fhVUC42S/+0cFH5X1aaI17VtP8V3Qx4106ldyO5vA4ZdfX0/dfbtf2Q9NExcmUooOs/sgv5I2XVOmM+2xt/sSQ=;20:a99b87r50r8ItrAAW7SMgnA207e50K+VoQDUsoxE7JfOkBionffoeWpWDi7N5WnGoT3FGLgRt4Z6ID03ORA/1A== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2015 20:06:51.7495 (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 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 --- CHANGE HISTORY Changes in v2: none 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