Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2293389rwl; Thu, 30 Mar 2023 08:25:58 -0700 (PDT) X-Google-Smtp-Source: AKy350aDkD0G54anfoh1hT1jaKnOIKAQQ72wggm+3T2Dm2kX++FSi0Jrxj90kPa40tu3/jW/DDJV X-Received: by 2002:a05:6402:2811:b0:4bb:c3ce:63fc with SMTP id h17-20020a056402281100b004bbc3ce63fcmr27383737ede.3.1680189958042; Thu, 30 Mar 2023 08:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680189958; cv=none; d=google.com; s=arc-20160816; b=nbKZOdCnR2db7gEYV/826rMQBzYyznYp8G9SqHUurFksBZULXJsdZNEDe9fssvBiUJ 5r2HfbfGTp5e0FTUvV9GA0MfXBjN/qmHENF3MxNA1ywK7gQj4pr7ecgDcI0Jg58qYOGb ejjLlQwaf0x3+7YQ+zDkGaN3XgMOfgOlhKREjxcHkCvdrNFIF9VXvjm4u6d9qxmVmZom +HvUfcfeHw9sEdz5WJyQD1p4dQ0kO427lpGVEbCnIFm00vC5SU+dgrQnXUaleyQMvCes SPNhm/y3STaFUr5aAkQlrSuu0baSu4r7kGJCSxZJIERtO7JAZV6zav0k5/nRrD6YzPFK i2Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=t9uimKcjm3fRrvJasPsvHFql22beiZRfNJYtizvIlzI=; b=Y7qEEr4TW7N2/vsUCHblOUKbobi42O919yVK57PffE4W6w7djxkWbhkJhJsEYoDWjF wbvvezApxIRLMyIjrw08kWAIa2rbKiFeqpg7G4OkQQ4PWROxN5hIEsvYO0Bgl20S8Mmv EXbnPF/+ZIx7HODNscaW4nBFBfvUx8YKdGG7oy4OJS8Qd5VOK7J7lz9hw5UgfrjYmBoh KCo6aDXP2tp0U8aUxfBAHFtb2ccrq+OYeQYUQhwX6q5JCDyoCjVBOHzFx9Hm3JZUZpaI NafJGjQGcmvGb8QPfdXrOgg0+3gQswpWDpkQzZ+Rz2zQCSB6Y0PtskwMnkUWyRnJg5KG qBrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m16-20020aa7c2d0000000b004fbe5ca598fsi20782edp.643.2023.03.30.08.25.32; Thu, 30 Mar 2023 08:25:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232986AbjC3PYB (ORCPT + 99 others); Thu, 30 Mar 2023 11:24:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232951AbjC3PXf (ORCPT ); Thu, 30 Mar 2023 11:23:35 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39FACCDC9; Thu, 30 Mar 2023 08:23:13 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1phu6W-0006hA-2e; Thu, 30 Mar 2023 17:22:21 +0200 Date: Thu, 30 Mar 2023 16:22:17 +0100 From: Daniel Golle To: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, Andrew Lunn , =?utf-8?B?QXLEsW7DpyDDnG5hbA==?= , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Sean Wang , Landen Chao , DENG Qingfang , Philipp Zabel Cc: Sam Shih , Lorenzo Bianconi , John Crispin , Felix Fietkau Subject: [PATCH net-next 09/15] net: dsa: mt7530: introduce mt7530_remove_common helper function Message-ID: <81b371db995cf19b670169ab1cdeeaf626ae5390.1680180959.git.daniel@makrotopia.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move commonly used parts from mt7530_remove into new mt7530_remove_common helper function which will be used by both, mt7530_remove and the to-be-introduced mt7988_remove. Reviewed-by: Andrew Lunn Signed-off-by: Daniel Golle --- drivers/net/dsa/mt7530.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index b3a9eb40e45a9..de2fa5df9332c 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -3264,6 +3264,17 @@ mt7530_probe(struct mdio_device *mdiodev) return dsa_register_switch(priv->ds); } +static void +mt7530_remove_common(struct mt7530_priv *priv) +{ + if (priv->irq) + mt7530_free_irq(priv); + + dsa_unregister_switch(priv->ds); + + mutex_destroy(&priv->reg_mutex); +} + static void mt7530_remove(struct mdio_device *mdiodev) { @@ -3283,15 +3294,10 @@ mt7530_remove(struct mdio_device *mdiodev) dev_err(priv->dev, "Failed to disable io pwr: %d\n", ret); - if (priv->irq) - mt7530_free_irq(priv); - - dsa_unregister_switch(priv->ds); + mt7530_remove_common(priv); for (i = 0; i < 2; ++i) mtk_pcs_lynxi_destroy(priv->ports[5 + i].sgmii_pcs); - - mutex_destroy(&priv->reg_mutex); } static void mt7530_shutdown(struct mdio_device *mdiodev) -- 2.39.2