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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70CE5C433F5 for ; Thu, 28 Apr 2022 21:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352218AbiD1V1I (ORCPT ); Thu, 28 Apr 2022 17:27:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352107AbiD1V1B (ORCPT ); Thu, 28 Apr 2022 17:27:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21566AC056 for ; Thu, 28 Apr 2022 14:23:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CA3CAB83045 for ; Thu, 28 Apr 2022 21:23:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99E5BC385B1; Thu, 28 Apr 2022 21:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651181022; bh=CxdJr9sUL4uDA0hrHBnFsXA2xcRUGBJZTByymZ1Jg5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8+3MeV/nrzi1KRmPf3kqGkwfxhxYUsqmVE/+lFD11VbEJuIoUeTw18SN2tYkU/xp 9pRgoljFCvqI9r9eSIKgzQoReP52FDVUchHIVWxm502divz5rN+eAndeASZ0Yal0xz rPD3s4gZN5hl0nOgdiC+cVfNqqsAC+bqbLxiYCE7TKtOcIgo+nczI7o1MSm5xdmxI1 U0Gkmufy9hVicsWNUAZ1+RGyL1m/c9kT88M4cPXgLaCzMhWoZDhtmF1MwjD/nVMept 30ScM0udWFYsNzl/xCAUsVrH7fFiwQy2h8bgXQXk4Hg/nIyC4l3448H06gTIPdXyPl /hBERYXpix2Dg== From: Jakub Kicinski To: davem@davemloft.net, pabeni@redhat.com Cc: edumazet@google.com, netdev@vger.kernel.org, Jakub Kicinski , Florian Fainelli , rafal@milecki.pl, bcm-kernel-feedback-list@broadcom.com Subject: [PATCH net-next v2 08/15] net: bgmac: remove a copy of the NAPI_POLL_WEIGHT define Date: Thu, 28 Apr 2022 14:23:16 -0700 Message-Id: <20220428212323.104417-9-kuba@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220428212323.104417-1-kuba@kernel.org> References: <20220428212323.104417-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Defining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder. Reviewed-by: Florian Fainelli Signed-off-by: Jakub Kicinski --- v2: update subject CC: rafal@milecki.pl CC: bcm-kernel-feedback-list@broadcom.com --- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bgmac.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 7b525c65bacb..2dfc1e32bbb3 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -1527,7 +1527,7 @@ int bgmac_enet_probe(struct bgmac *bgmac) if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0) bgmac->int_mask &= ~BGMAC_IS_TX_MASK; - netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT); + netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, NAPI_POLL_WEIGHT); err = bgmac_phy_connect(bgmac); if (err) { diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h index 110088e662ea..e05ac92c0650 100644 --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -364,8 +364,6 @@ #define BGMAC_CHIPCTL_7_IF_TYPE_MII 0x00000040 #define BGMAC_CHIPCTL_7_IF_TYPE_RGMII 0x00000080 -#define BGMAC_WEIGHT 64 - #define ETHER_MAX_LEN (ETH_FRAME_LEN + ETH_FCS_LEN) /* Feature Flags */ -- 2.34.1