From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932070AbbJQQeH (ORCPT ); Sat, 17 Oct 2015 12:34:07 -0400 Received: from mail-bl2on0148.outbound.protection.outlook.com ([65.55.169.148]:27712 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753098AbbJQQdb (ORCPT ); Sat, 17 Oct 2015 12:33:31 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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 v3 09/12] staging: fsl-mc: refactored error exit in allocator probe/remove Date: Sat, 17 Oct 2015 11:18:21 -0500 Message-ID: <1445098704-11708-10-git-send-email-German.Rivera@freescale.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1445098704-11708-1-git-send-email-German.Rivera@freescale.com> References: <1445098704-11708-1-git-send-email-German.Rivera@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD012;1:YHUYIWdCRbSUmkupQchjBE05MA0L4CTJE8QpfdqBXvNF/PTGbwc5lpZBxReZVAQmf9PGIZufHVSJICAdj6bYlqgodYpub93aiboq4N911Fv6a3dOV1VqCjSOT4QNcgC1byefg/wWWjJXLG1HrYD2iw7hMGFbCLHo9FIv43dybMIb2shPkvK3h8yZ89o1j23R7NXFK5RRi1v7y0bZqBZWtY5kiRs3904WStc/H1UQKoAuWG6e5023WT+DzTjY2WpjEg5H+KMsSOMavZisXlYEV1RmIuoc48w6BR3LU6hPxykK5SomzOGqDHFCDLHmRqYvInzAlb7VuaBMfPLxw+pHxFjTw7QxqP4KSyonYS/bluww0ihzJCS4oQmv/IH4YPoCzLoiNngdYj1REu6W5pK2hQ== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5008740100001)(106466001)(6806005)(76176999)(104016004)(2201001)(50226001)(47776003)(64706001)(77096005)(5001770100001)(97736004)(5003940100001)(36756003)(81156007)(229853001)(50986999)(107886002)(85426001)(5001960100002)(87936001)(105606002)(50466002)(2950100001)(48376002)(19580405001)(46102003)(86362001)(5007970100001)(189998001)(19580395003)(92566002)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0301MB1302;H:tx30smr01.am.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;BY1PR0301MB1302;2:y4wPjfQ5f7VoQiBC70wm4bXazpmkkmpVb91tBrrHfX2tg2U8N4yeAglmT8CWTt40ShA5G7Wp2fAwvrzh7vhMs2gCOfDSp/i26EWlabfZ0G6FT1S1BWp/vSiMcoHmUIq0U3sd7gF1UwGNoDkphTezDYe+DFeXfq9Dftx8F+fvZmg=;3:jRYkINEDBq/TVlc/0lKDYTXC4Uu+U1HFB9COC+B2A2vJav2wp36j5Mj2u4gU9DLpfbfFq+y4RO0h1vxvI4t3RnaFGJF/popwV5VSLrSK9UmMl0hYy1tmL4kQL13QMdWBj4KJV0/toVOqQxE7bvjF3xzEFXo6+3hBIGfxg5dTGmtG/z5QAhLRd0flf1VyXvcJlfDJEAIar9ae8AlHbsS7S1yaK7zRiOyF6RdLlKgx0k8=;25:szZmwue9nwzoOt4E2fuE9RZ/UaujJCoZtXaNk7T9HqOS9Y12TOaMY9sXEfoxW4ngnbHi0B4iHZ8p/HtsPuPtjiMn7bni7vVw0OTUPhLxwn7qfDE7bpKRPZp+RAsIiTKqcE3WaruCIvEghFJdJvAplEgnGLlN7EKU7kkpSqoHwa2ib362jEorZtdtmkbOq1qyDA3DMy3MHAB/ODu84n58xAyL5lU2VuW1qPzoL83UGmC/W3trVWroo6RRYDFCLMeUQfbxCg2O/KxN+XaPqPY8nQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1302; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1302;20:Jfq9Y2Ap16aPPQY9xU27J6H26HiSyGelHaRFcfXGQspLLVP22B2Yr6iS9qSNgCaF3jxlHj8913XGR0iW6q8cznm5uv5epFiw6LIt9RwnEqtS8keNpRWf0F2SSzkuKv0MIbLR3agiHKILSjJTx/8cV85sNEg7YkOnfTEsHGaX1f+a15OsY6aXlOtVCi7qiqWBlqsE9l6WTTqTMosT15L4fogOdW+M3LC8n7cPAS7Ma/9L+JTFgQ10PV3IgsBugAOJ1MGKRSKn5wPFQ/yiXkk/Jsqljyx8bUvgBpjLLMi5/X9GH2ccVv/4w9mkonzBTaZ4rtKYsjjo7xejygdcvqn6qLwYYrzFQi3CDeKnlzD5UAc=;4:KsWDntiQQx9+9JG0TOcw/BFtJmPff4V2ITp2k6l2wghYKTk2PR73u7q0OyiOkfsr6gTNd2mJt34LFRJNrv7rdPJ3mTqKCtT+rweZxtxr6NqbKZSomq8iDIECuoQSkIB+sf2cXv6oe6fnJEgeNT72GF+lvbYRHnw6+vLt22Yq6OtXMLqq3NyOw46uGoiWkD56NWoBwn5+MT/UF3RSfNj6M5e4x1PM0BDVLLcScLeRnEPk1UtOYgrLmbBMOHjMBSavJlz0YJO7pCzlgDaCE3qA+d9J0D8fZlZIlYdil0RGKDXkSjFqA177/sYgwOt/r51xcwDkvSrSQlXrz0amgFIMEGer6gdtNMqnlmiVwXpYnmU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001);SRVR:BY1PR0301MB1302;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1302; X-Forefront-PRVS: 07326CFBC4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB1302;23:SPmRm+kZ8xrPpGXRzDCLQ6w/F4Z9aLVyggRXkIO?= =?us-ascii?Q?F4l8FWA+WxPikv8nX+oxfSMIPZi8kNksqC/bvEluTMf7f+dBXf84NxgFjOne?= =?us-ascii?Q?OWffU7QSteqlcqNnwInqxGMKJvPHomcNqYdgSBA7+X9hbvi7/4pRQuGYfM9p?= =?us-ascii?Q?tRh3ijj6+eKQ36qNPgodUZd+Ox1km9jRMyS5VZvyJSCaRgXqlYamipZq9A/U?= =?us-ascii?Q?1maoYVRXnBPzdOCtvTmOeQJK31rNxSazRNaFfqVBZIdWEjB2HnqnzIj2MHoL?= =?us-ascii?Q?x186u+GBtxBExr/dn61nxhSHQyFaSLGBEMSf1dz27VRyQl51eY3q44RIBLVG?= =?us-ascii?Q?N66L+w7vKWArmb8vH1oVpdb51OEkbaSn6vIdHc84Sza8t1YZyH7ghOAjvmY+?= =?us-ascii?Q?pseaSmvApuu+GOKaDtkmWzgkRe9ivQ8KKqyY6WS3jgKg3R/+f9dKHTpqmWEk?= =?us-ascii?Q?hJ6bjpSyvDPLR0ZedO3rKKIb3QcPQy/VIxGIm/YnPWngdk9BmpcvL4CgepsF?= =?us-ascii?Q?NLYyBlO/lVH0vqgqdAjykj+rtU+TYxbLuiRb5cvB+Sfd7OKqYklGR1QT8hw+?= =?us-ascii?Q?Fv165wRuYl0nEAnsmb/plKnujVRL0/AlszZ8amksqJzCFX0RmLHiIFdniA9I?= =?us-ascii?Q?XLKVrLRCjvDoqmTJnI5pehoGrH61SAerdTOPUeSM+KwnYlw/so2Tk9CQ8fCq?= =?us-ascii?Q?5nbPvMTyd/ptyz444Nu3fJ2z/38MbTvB/N9StmrEos9NCfoZ/bmpEJ/Zl0OK?= =?us-ascii?Q?IV6JbKMBdGPTTPjuVqg0j42KKKcLDLOGsFl1s3McK27j+nBgnItQiFinD5r/?= =?us-ascii?Q?eMIhZUrwc4PjCcF4sSj52fmEA+mR0LkJFo1zt5P7uzNFrRi1mrBfb5LDT1XF?= =?us-ascii?Q?bUJXddJiNZQ9wXFm1Gosr8x9voI2YGNdArL8x9gY3CT8ytw7TFAeUCmtT7uX?= =?us-ascii?Q?OTi91GAnRaS74pLy+d6PkaufKbgttyv0B31ZkPNqc9idiHLmq0qbxpynwvIt?= =?us-ascii?Q?iJU2Vlra5RS5Hhfg1h8OOps9Q5kxRHVIizvNIPchZnNyEgELIqSBk99CHIh1?= =?us-ascii?Q?Darm4QRmmQ9B6Kc1xcKYf6E9PuU0oBfsudyCsitmJIZ3rsZ0IhA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1302;5:5g/57Cd5fuJYm4D21CAD6a9Du1BAISRcfuu1h7Xawe4YNVbUcysLtjOKli50s6eYftGgysj8WeM+EFVmgNmkMM8IJxsd8GcoqosJ8LQk6WaFvCI7IrGHMymEAd3PFOixC7NN1QZh+smAQIT5D3tMmw==;24:CLiXeVYC9P97eTj7n0y869uVZapwiW+/yZjsUZdlJ0dRDnYcgHKT8pHd76hkgvHHlTDB9BLMyM4MGts0w4MvLwHgr79zmb8xkZIP4NUQau4=;20:6X37PHCwh925iDbiO6voZkV2M7+6LMqOazebQnWj6hWcKSSdliYpkbRqb78++Fzk42Eho9YiAMDtRt/H5cXUKg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2015 16:33:25.7923 (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.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1302 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 v3: none 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