From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A73DC49EA2 for ; Sun, 20 Jun 2021 17:53:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E96FB61164 for ; Sun, 20 Jun 2021 17:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230206AbhFTR4D (ORCPT ); Sun, 20 Jun 2021 13:56:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230047AbhFTRzr (ORCPT ); Sun, 20 Jun 2021 13:55:47 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC057C06175F; Sun, 20 Jun 2021 10:53:34 -0700 (PDT) Received: from dslb-084-059-235-131.084.059.pools.vodafone-ip.de ([84.59.235.131] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1lv1dU-00012S-Pd; Sun, 20 Jun 2021 19:53:32 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 09/13] staging: rtl8188eu: simplify rtl88eu_mon_init Date: Sun, 20 Jun 2021 19:52:57 +0200 Message-Id: <20210620175301.14988-9-martin@kaiser.cx> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210620175301.14988-1-martin@kaiser.cx> References: <20210620175301.14988-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org The code looks a bit nicer without goto. Signed-off-by: Martin Kaiser --- drivers/staging/rtl8188eu/os_dep/mon.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8188eu/os_dep/mon.c b/drivers/staging/rtl8188eu/os_dep/mon.c index 9b40de7d39e7..6370a3d8881b 100644 --- a/drivers/staging/rtl8188eu/os_dep/mon.c +++ b/drivers/staging/rtl8188eu/os_dep/mon.c @@ -163,18 +163,15 @@ struct net_device *rtl88eu_mon_init(void) dev = alloc_netdev(0, "mon%d", NET_NAME_UNKNOWN, mon_setup); if (!dev) - goto fail; + return NULL; err = register_netdev(dev); - if (err < 0) - goto fail_free_dev; + if (err < 0) { + free_netdev(dev); + return NULL; + } return dev; - -fail_free_dev: - free_netdev(dev); -fail: - return NULL; } void rtl88eu_mon_deinit(struct net_device *dev) -- 2.20.1