Skip to content

Commit

Permalink
ath10k: remove a copy of the NAPI_POLL_WEIGHT define
Browse files Browse the repository at this point in the history
Defining local versions of NAPI_POLL_WEIGHT with the same
values in the drivers just makes refactoring harder.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220429174643.196994-3-kuba@kernel.org
  • Loading branch information
Jakub Kicinski authored and Kalle Valo committed May 2, 2022
1 parent 00402f4 commit 52bcfd1
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions drivers/net/wireless/ath/ath10k/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
#define ATH10K_KEEPALIVE_MAX_IDLE 3895
#define ATH10K_KEEPALIVE_MAX_UNRESPONSIVE 3900

/* NAPI poll budget */
#define ATH10K_NAPI_BUDGET 64

/* SMBIOS type containing Board Data File Name Extension */
#define ATH10K_SMBIOS_BDF_EXT_TYPE 0xF8

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath10k/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -3216,7 +3216,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar)
void ath10k_pci_init_napi(struct ath10k *ar)
{
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll,
ATH10K_NAPI_BUDGET);
NAPI_POLL_WEIGHT);
}

static int ath10k_pci_init_irq(struct ath10k *ar)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath10k/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -2532,7 +2532,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,
}

netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll,
ATH10K_NAPI_BUDGET);
NAPI_POLL_WEIGHT);

ath10k_dbg(ar, ATH10K_DBG_BOOT,
"sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath10k/snoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget)
static void ath10k_snoc_init_napi(struct ath10k *ar)
{
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll,
ATH10K_NAPI_BUDGET);
NAPI_POLL_WEIGHT);
}

static int ath10k_snoc_request_irq(struct ath10k *ar)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/ath/ath10k/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
}

netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll,
ATH10K_NAPI_BUDGET);
NAPI_POLL_WEIGHT);

usb_get_dev(dev);
vendor_id = le16_to_cpu(dev->descriptor.idVendor);
Expand Down

0 comments on commit 52bcfd1

Please sign in to comment.