From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751546AbdJ1SUR (ORCPT ); Sat, 28 Oct 2017 14:20:17 -0400 Received: from mout.web.de ([212.227.17.12]:56445 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdJ1SUO (ORCPT ); Sat, 28 Oct 2017 14:20:14 -0400 To: netdev@vger.kernel.org, Murali Karicheri , Wingman Kwok Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] netcp_core: Use common error handling code in netcp_create_interface() Message-ID: Date: Sat, 28 Oct 2017 20:20:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:oy6cP4+vAJxH2++JzhTVi+87e2uabew4M99dm22FkytKWVb6C6H ZmnSL2MLUSjstBKN49kwdJpTLxBgw4zSbmmupvQtKYAO8o/FHxDKpLGQhIJTiUI1rkmscw9 0nvUoiXk9dvTZ/tam4fz77Pz8KdKJCSF2V4SJXxH1BpwrU/VoKM8WuvFn48xMBC0vN3zL5z RgPpknpYUP9PtjFx3VY7w== X-UI-Out-Filterresults: notjunk:1;V01:K0:/XlGAaIjJr8=:q02ZVXkck0TFzkzB5tH3kB XfRMizDpWJqpnJ9k0FgYNpYCQ7hg+Ubcvi/r1MZQZ4YGuMLzsf3XA2U0EBI4+GK+9Z05xSTLW xQadK83Dcz/lZu0dSFjKLAwN0J+UcyX/BpJ/dDo4kvqUjZFw9HRvyyj5lLifZsU1GPYTzP0M5 tPPwQjNRAv9b6hveFSnfJBkD5razRWGv1JTvvd9vezrKU/DFpHlP/FJZxMdVrUIMUdGg/Bubk SXV3F7sRA4ddMU0uuYuyZPxINd01bS/ZOQ5D7hiX3Fz7vhYQ/nl8WnNYLQ/s07MCvKS/jEw2K QwUspQmUYp77k78eKXTUrIN6EPtoNQfmEdvW85YyMOuz0hYID95p0aX91TeCshOifke4MAOqf aQlVQ9oiEqn3u0jb8vf7fShcdQ2PCeM9WlzdClWmg2Dq2BDiwmL0BE2/Xg23nSOjhKtBb1Bv8 jj6RlsgH7AGozlN9TGMwJXD1K9U+5YiunYb2IaG7GdB3nuHdarBJgElClGxpvrpOvHFBkkx79 78RJB0UzJ+njtapq60mFRfJOhze8tRo9yi2YbJad7BMX7RDhnvL3npwa5S1BwQw1QgV81VImo p7WrIdOcaLVYba88OLhnu3YQEFKTzLDLsmSQhlc//PsqHA7LmQux16WAU6x8MCLwcStROfCOL BYCKQLzhF+ZWCx+haGSVa5MzKpp6tKTAxnvqQc34xLx6T3qJiukpPeaJDbJGMCJiIVTqdG0g4 X0eh7REebxlqF3/G9JAVr2/YeCeixXrbFqfbqh4S0cifhtOGzY+hr3OEvQZZFGTZn7D1/6FaP 2bLstT1Aba18mMxOrqXlFSbh87EIMShiuFdtHNxJlPmFUyUmIg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 28 Oct 2017 20:11:02 +0200 Add a jump target so that a specific error code assignment is stored only once at the end of this function implementation. Replace five assignments by goto statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ethernet/ti/netcp_core.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 437d36289786..8fb17df6daa8 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -2009,8 +2009,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, if (efuse_mac) { if (of_address_to_resource(node, NETCP_EFUSE_REG_INDEX, &res)) { dev_err(dev, "could not find efuse-mac reg resource\n"); - ret = -ENODEV; - goto quit; + goto failure_indication; } size = resource_size(&res); @@ -2049,8 +2048,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, &netcp->dma_chan_name); if (ret < 0) { dev_err(dev, "missing \"rx-channel\" parameter\n"); - ret = -ENODEV; - goto quit; + goto failure_indication; } ret = of_property_read_u32(node_interface, "rx-queue", @@ -2071,8 +2069,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, ret = of_property_read_u32_array(node_interface, "rx-pool", temp, 2); if (ret < 0) { dev_err(dev, "missing \"rx-pool\" parameter\n"); - ret = -ENODEV; - goto quit; + goto failure_indication; } netcp->rx_pool_size = temp[0]; netcp->rx_pool_region_id = temp[1]; @@ -2080,8 +2077,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, ret = of_property_read_u32_array(node_interface, "tx-pool", temp, 2); if (ret < 0) { dev_err(dev, "missing \"tx-pool\" parameter\n"); - ret = -ENODEV; - goto quit; + goto failure_indication; } netcp->tx_pool_size = temp[0]; netcp->tx_pool_region_id = temp[1]; @@ -2089,8 +2085,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, if (netcp->tx_pool_size < MAX_SKB_FRAGS) { dev_err(dev, "tx-pool size too small, must be atleast(%ld)\n", MAX_SKB_FRAGS); - ret = -ENODEV; - goto quit; + goto failure_indication; } ret = of_property_read_u32(node_interface, "tx-completion-queue", @@ -2113,6 +2108,8 @@ static int netcp_create_interface(struct netcp_device *netcp_device, list_add_tail(&netcp->interface_list, &netcp_device->interface_head); return 0; +failure_indication: + ret = -ENODEV; quit: free_netdev(ndev); return ret; -- 2.14.3