From patchwork Thu Oct 5 18:17:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13410594 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51C0F3B7A7 for ; Thu, 5 Oct 2023 18:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="PabBLhws" Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A11198 for ; Thu, 5 Oct 2023 11:19:42 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1c63164a2b6so19031055ad.0 for ; Thu, 05 Oct 2023 11:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1696529981; x=1697134781; darn=vger.kernel.org; h=mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0sNUJvQAqAntbbyRrW5Akp77hW9wafJ/wJDzSYVFj8k=; b=PabBLhwsDHzr19Ek7l866UxxK9gCi+fMx8Y2YN1D3PsrOCfh7v0fdTXOWOtDhKH/AX 2gsQzOGWdaIxNUakQLP6otWSCakqhUEO3TjFNQZbMnRwxTkcWkL08T3Tdutc/D0SyJmK pyylKb059EaYSg0DWqZ5MUHCxXoiJzjp8zdp8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696529981; x=1697134781; h=mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0sNUJvQAqAntbbyRrW5Akp77hW9wafJ/wJDzSYVFj8k=; b=KluOzScEyg5UWRFiUjd28QhDStFptk0yyf3lqf8WIjrUpfeAvAVGKZz89wBDimfXL1 R4QUjBBx0Evhzbh5ZNtdhElBdknXrY7qrqR4W8QhR6XTma1THhZN9RDR46jk2UBJKRci gwaE1mrXQg77tljjNzRJtlPQkpKLHDA6Cg4XPRQN8XXNyS9PvML3RX1Q/8VOvew+iMqw 7gmXokhjq/Y+vzNqMvB8tKWTGXeVSmPA0YS1xQ8IdOeRPan5wK1PnukLrgFxajQSTD97 M9bNHhW9MDi4W/n51b9x7+WJS7gKq5TZv06ZukDK51T2FWkrr4KZ8cAfBae1afBtvaNN /2Mg== X-Gm-Message-State: AOJu0YwKYEPloRZMXas6Ei3TQ14z1B9dMug5eo31SgKdeHQ24CWLXgn5 wa0WovVWajCHXPZFW0OmMR8lMGYfqpuvNnAaUMbD+93ROC1S+GfqfEY8EfEBeKFGsXoyJu1/Kml 4G8lUFkwZjAoJ1vbqFjJRL1AOUb4HGrmktXBiuxzCGDWngFCzQ3EAmfIAlwadZfq2TSdAHi1lq1 2UVMmo985rDg== X-Google-Smtp-Source: AGHT+IGf5HwActCaRtzmx96XjYyZVnh5b3rAhaXoJPoes1Qe6VFN6+4iGIbowa85yMPOA6soVitaKA== X-Received: by 2002:a17:902:e745:b0:1c7:7c2c:f828 with SMTP id p5-20020a170902e74500b001c77c2cf828mr5290460plf.8.1696529981074; Thu, 05 Oct 2023 11:19:41 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g14-20020a1709029f8e00b001c61bdd8e82sm2051208plq.109.2023.10.05.11.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 11:19:40 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Doug Berger , Broadcom internal kernel review list , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net-next] net: bcmgenet: Remove custom ndo_poll_controller() Date: Thu, 5 Oct 2023 11:17:47 -0700 Message-Id: <20231005181747.3017588-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MIME_NO_TEXT, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org The driver gained a .ndo_poll_controller() at a time where the TX cleaning process was always done from NAPI which makes this unnecessary. See commit ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional") for more background. Signed-off-by: Florian Fainelli Reviewed-by: Eric Dumazet --- .../net/ethernet/broadcom/genet/bcmgenet.c | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 91f3a7e78d65..9282403d1bf6 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3247,23 +3247,6 @@ static irqreturn_t bcmgenet_wol_isr(int irq, void *dev_id) return IRQ_HANDLED; } -#ifdef CONFIG_NET_POLL_CONTROLLER -static void bcmgenet_poll_controller(struct net_device *dev) -{ - struct bcmgenet_priv *priv = netdev_priv(dev); - - /* Invoke the main RX/TX interrupt handler */ - disable_irq(priv->irq0); - bcmgenet_isr0(priv->irq0, priv); - enable_irq(priv->irq0); - - /* And the interrupt handler for RX/TX priority queues */ - disable_irq(priv->irq1); - bcmgenet_isr1(priv->irq1, priv); - enable_irq(priv->irq1); -} -#endif - static void bcmgenet_umac_reset(struct bcmgenet_priv *priv) { u32 reg; @@ -3720,9 +3703,6 @@ static const struct net_device_ops bcmgenet_netdev_ops = { .ndo_set_mac_address = bcmgenet_set_mac_addr, .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_features = bcmgenet_set_features, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = bcmgenet_poll_controller, -#endif .ndo_get_stats = bcmgenet_get_stats, .ndo_change_carrier = bcmgenet_change_carrier, };