From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751568AbdJ0OL7 (ORCPT ); Fri, 27 Oct 2017 10:11:59 -0400 Received: from mail-cys01nam02on0056.outbound.protection.outlook.com ([104.47.37.56]:25376 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751393AbdJ0OLz (ORCPT ); Fri, 27 Oct 2017 10:11:55 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=fail action=none header.from=nxp.com; From: Bogdan Purcareata To: , , , Subject: [PATCH 1/5] staging: fsl-dpaa2/eth: Label cleanup Date: Fri, 27 Oct 2017 14:11:32 +0000 Message-ID: <1509113496-10810-2-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> References: <1509113496-10810-1-git-send-email-bogdan.purcareata@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131535871125280196;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7966004)(336005)(39380400002)(39860400002)(346002)(376002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(86362001)(575784001)(50226002)(5003940100001)(77096006)(498600001)(36756003)(47776003)(8676002)(48376002)(50466002)(105606002)(316002)(68736007)(81166006)(81156014)(2906002)(106466001)(189998001)(305945005)(8936002)(33646002)(356003)(104016004)(50986999)(76176999)(97736004)(85426001)(16586007)(8656006)(2201001)(49486002)(110136005)(2950100002)(6666003)(53936002)(5660300001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR03MB2361;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD046;1:pxcDZzCgFJv5mh8WQ4nJcnFjO8TEmrvmqeGR43oqV33aJ+ioXiyI8Z3oGUni+2IFZLMZVIpZse5AjBxPhmjHSpRxb4sqsxXTKCu+S3eRRvEt0+zHdX+6n/O0Yq9zPn/D MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7ff29ae-eb6a-4469-cacc-08d51d44ac08 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603238);SRVR:CY1PR03MB2361; X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2361;3:njLb/sJRAbYxbJvEdXf4nk2Luf5kaxoDTju7qatCA9uWtQykTmgHlZlHx1ViKtg6HD9qrec1NRCR70noNv5v1sXF3dh1qep9K6eyehkR0XABZA6vpKQ60BvwhIcpCI4Oh+qncqZhzQ6l/sDBnEnPKLdg76Cl3YdEUpCOnzQn7ThQfi8VjpRqJMcYGy4eel2pCXBJ+jxps39l/Nje7Y4pTYOAb5YolyT4A5S6TqxblUidJg1KNu1w125n1jiZUWXgjUs9+FTXD/lCLtgrF090TDMRk3WjtEsu4kDyWGYWbO/vTaJk8HyOj5PXtHuy8xwMMp0f2QVC0KkdIn9zCb7P4npUEHFT6lg7jYsth44h7iE=;25:mjrz1KgFM4ePHpLSW9VI8GqljtmfwI854Sz1DipnNv3Ba4XlLDIGZc42N/ufA5k7cwVciPprOQDxRlsEcnd2NuNVAl1dovKFYJ+kUrZ+zj9O/AM3v97QtrXN6AOT2nUzC/hhFYueAjwH3L33JomQ43TspQJkkp0u/03iTrCGPeOVKi15fJBBK49USmxfB0fg8i9CvFRSzI89uSe0Na20C0OqroZ78HSPM1bKKUprgjUHE1oHsJxiDoko8tXkNLDpNQyod30ZHdtA7s6OanZktVM4iVprM4BhELUamEnHkrUdLxLz3JL8b9oB0zq2RTynQgS3O/jB9ZgGVp/4+FS7hQ== X-MS-TrafficTypeDiagnostic: CY1PR03MB2361: X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2361;31:NCM9e+zBcZeJJ8VBUZ0AcKBKo1U3xwY+Jy5YrTlr9urMbHruIDOPvTtc9lqegTvpAzgSZgD8hM61jtHUAITMG17npVUS4C/o3Go69/RzDI18ZeWznt/Q7lUWg8uB+tScmFZAhL8St3MjfMA7Z/fNo4DsZ0CbyV0y6lmc0h1E68YNZzWlsVG8ekIjgyT1/HFSvNaNF2CU1E/aUV8JicfweMyauK+cipal99rJQ2Cvw9E=;4:o8oN6dVREoxvYZjlL2ZIn7PKYxChYJQw/sEGzMybEswPm8df04rzCgzzH2+bYWyfHMkcdu0hNdR97e0OozP+QIH0nZ8wwiCHqJWwx8pWw9PmMe9BnPKScrtBsQrB1TAjvriTSjtUj2ZqQro2rIXE+4ihnZPji43iPYRLMb+STuo8fB8jKJtXfoNBcgfeDkNVNAOPWuU8iDuZm1ElfbhV7eMswIhOHmu2EaCxbOsGC9sqkUeFzgJFUHxsFnv6HO9St0KRa5JkZCy96UfJDDwhgJHzcrgZtLUr5iBKtJDOpcdFGJASwKS3Z9YkjH7AAapy X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231020)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(20161123561025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123556025)(20161123563025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY1PR03MB2361;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY1PR03MB2361; X-Forefront-PRVS: 0473A03F3F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR03MB2361;23:HrmpE8ABgj7Dqg+uWhca++0QRGdN105pqfYvPpTL+?= =?us-ascii?Q?kxP33RbAWUNADNI1/MiXMq3rb6VDeiInZlHSK9aKfS97XfkjCpwfo3TSszmZ?= =?us-ascii?Q?uucsMYR97LjMxddHoMGdBDbu7qDFKu/C+tP4fxk46Fpzjky5YqV+yH5GqsNn?= =?us-ascii?Q?kiOOxD0fAaRGYPzoB6bAX/LwlpWPZTwGzTwBNRJ0nTALSkEQwh72fpLaR+Cx?= =?us-ascii?Q?GqJ83hQjrvr12OK59pNftT5FGLT4fca47JZzXMyVxhzA1PW9+dzRVO1j5OQy?= =?us-ascii?Q?bqjkCK5XKzY+Mzt3578O8FLZNk5tIViSLHs0remnIpA28YbMD0vmT/HDeAQU?= =?us-ascii?Q?kBXVAExmA5tW8x8AQlmg23NwsZ6l+mDqhkY1V4UtTDMEHGdLKEYL534fV2ra?= =?us-ascii?Q?LQF/EgA+clWiz6UGfcSGYaM7Q9EbWlXFbfWBrcRpP7GwLx0YuK9XtarKpV2L?= =?us-ascii?Q?yXpRhrlDhtPg76sJ336LaN2DOQNM+dM0KBZRMa1WgDpFc4s0Car6XsgIc9VP?= =?us-ascii?Q?AZZgHb3jUsflKSH3hwzSm8+Pk8P11TiEKUXLshjhA+4YsGiuiKSeWGs29H/M?= =?us-ascii?Q?lbfRye5KQvLEXn7HpYILZpKvaohubExG/tdIcHpONHNQin9EyZ0g1YDmmVYN?= =?us-ascii?Q?mzA/B5k0ClZvhMZwbAMs9E0UJ+uOb5xGZkCRAcJZ0Vjn/7IsWT5s6d+3XRya?= =?us-ascii?Q?r7OVjbGCg23bbl+k3dg5hNajGVW6nvepvoiElDVtrMCiRcmKRy0ypydaXuIf?= =?us-ascii?Q?xdUWmHLFg4fpFmKWbqqXjRV+TmXgNavJGopYksd3Lg8FQ040PwmcbpQ7TMcz?= =?us-ascii?Q?KUpu6v/4gRSH/NWKROKmai8pseYY58/vjF09YnU3AoV8dnSKvovVLcjdgrTM?= =?us-ascii?Q?xTCO59JbVF1LMi6Rat6bn7Ctko/EP4Kau0JlpfBozPgqkLAcn8Lrctl7dTg2?= =?us-ascii?Q?cFnb2vHGIz3Pzl3NI0E8Yn9juU4NBgbD/sz3toFQ9azqoYOA6qDXIxJ6Srld?= =?us-ascii?Q?orECXrYKVPkzqqgPnU5FDuCoOvQsyVcyogDWPVUwualzxC+ceXQt6s+KpYlZ?= =?us-ascii?Q?qcz0vO8gv+NX2G1ACt/7yYc8niXCfzfMRmjh0ek2gexvLFTyMAGkGmaeCPof?= =?us-ascii?Q?LJh2+ydQdNqh0zCAQWZZM+/z9NHT5pgOV6mBfUA309oPpFQKuI/vn/ahSR8h?= =?us-ascii?Q?dUVrJr8PBttBj4=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR03MB2361;6:s4cT/CkDeRmPQ9XPT0xY9dH2a4vFeS5KH3E7CfBhOeaI4qdfNEgVBRXfQew4uvIXYu23Po28rWfA7yWd/L+TpRRFlspEqHGkCIQP+PIsCJ+3p5YBmW3oit1v8/4hRw5HrF65hV91QJnFtsDfy6cOz6K87ke0wjgOi84wXoa4pMdrlCgrT92ldmg1lEfNg53pTbp5ZccmxDPqjrVvlu2JnSVele7ee8OJ17go/QUGdTfIWqV5j0wjH+gMUCJPoZ1KLjIjUiCQMLPvoSSNY6dn7xcad+sBKFScSYzAjpWsakfn/SRzUfr9jiU5nPFXD41eWZXkCnpcXTD/Rmypqa/Twqom8ye6enOqVazvQO6l+u0=;5:ArA5BUbzua9F6TkQiygvEAkY33q6epYmBCoM7RfcMbXIgvvEKJWBQDDUmN0gcc8H6M6DWZEQBlSJ+qBZi1/0PndSpm898oQuAs7Esn1QpuqQhjgEmM9ERNWBRmvIoeL1yU8LlFEeVTNwBq96PrTLyBi57S+5DitoiBseiZ/LerM=;24:gs5B0m/KdfkSQy+o4JhybryWRk+1N0oIoteRYEfyggyrU942X+U6kvzro8fzZyrfJhgJOYBtcQ60zT26QKgq2LQQdODafy47IZK3l/FI6xo=;7:nvhlcRAEekyqzzIJnbcq/tTLgmMNElXDVfkRDjUdeYHCeHzMa2yPz/eo/RLTsm9n8zAoNQKtSo2cA0ZnKjRK7LFIxiCpGrcYn6kUKoAb/JNOWvtn6iUHU2Zq+Euse6WVuXXqWXnlYGQZALIjicdDopbLDKQgLNVshQ6nuVdubr3F3Sv2SHTq0LEgvd1vkxBLoSNhFZEQnRO/eMX4Fny4Eex0ojL8397muIYz2NJmiJvpX8xPdotMVTVQQWPx8NV7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2017 14:11:52.2160 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7ff29ae-eb6a-4469-cacc-08d51d44ac08 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2361 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ioana Radulescu Clean up goto labels in a couple of functions, by removing/renaming redundant ones. Signed-off-by: Ioana Radulescu Signed-off-by: Bogdan Purcareata --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 35 +++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 9fbc0ee..5d2bd18 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -1444,34 +1444,32 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv) err = dpcon_open(priv->mc_io, 0, dpcon->obj_desc.id, &dpcon->mc_handle); if (err) { dev_err(dev, "dpcon_open() failed\n"); - goto err_open; + goto free; } err = dpcon_reset(priv->mc_io, 0, dpcon->mc_handle); if (err) { dev_err(dev, "dpcon_reset() failed\n"); - goto err_reset; + goto close; } err = dpcon_get_attributes(priv->mc_io, 0, dpcon->mc_handle, &attrs); if (err) { dev_err(dev, "dpcon_get_attributes() failed\n"); - goto err_get_attr; + goto close; } err = dpcon_enable(priv->mc_io, 0, dpcon->mc_handle); if (err) { dev_err(dev, "dpcon_enable() failed\n"); - goto err_enable; + goto close; } return dpcon; -err_enable: -err_get_attr: -err_reset: +close: dpcon_close(priv->mc_io, 0, dpcon->mc_handle); -err_open: +free: fsl_mc_object_free(dpcon); return NULL; @@ -1794,7 +1792,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) err = dpni_open(priv->mc_io, 0, ls_dev->obj_desc.id, &priv->mc_token); if (err) { dev_err(dev, "dpni_open() failed\n"); - goto err_open; + return err; } ls_dev->mc_io = priv->mc_io; @@ -1803,14 +1801,14 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) err = dpni_reset(priv->mc_io, 0, priv->mc_token); if (err) { dev_err(dev, "dpni_reset() failed\n"); - goto err_reset; + goto close; } err = dpni_get_attributes(priv->mc_io, 0, priv->mc_token, &priv->dpni_attrs); if (err) { dev_err(dev, "dpni_get_attributes() failed (err=%d)\n", err); - goto err_get_attr; + goto close; } /* Configure buffer layouts */ @@ -1827,7 +1825,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_RX, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(RX) failed\n"); - goto err_buf_layout; + goto close; } /* tx buffer */ @@ -1837,7 +1835,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_TX, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(TX) failed\n"); - goto err_buf_layout; + goto close; } /* tx-confirm buffer */ @@ -1846,7 +1844,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) DPNI_QUEUE_TX_CONFIRM, &buf_layout); if (err) { dev_err(dev, "dpni_set_buffer_layout(TX_CONF) failed\n"); - goto err_buf_layout; + goto close; } /* Now that we've set our tx buffer layout, retrieve the minimum @@ -1856,7 +1854,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) &priv->tx_data_offset); if (err) { dev_err(dev, "dpni_get_tx_data_offset() failed\n"); - goto err_data_offset; + goto close; } if ((priv->tx_data_offset % 64) != 0) @@ -1868,12 +1866,9 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) return 0; -err_data_offset: -err_buf_layout: -err_get_attr: -err_reset: +close: dpni_close(priv->mc_io, 0, priv->mc_token); -err_open: + return err; } -- 2.7.4