From 60110572bcd04605ad8ce1d6d796390cadcb361b Mon Sep 17 00:00:00 2001 From: Owen Huang Date: Mon, 13 Mar 2023 01:38:50 -0500 Subject: [PATCH 145/296] brcmfmac: replace SDIO function number with definition 1. Add definition in include/linux/mmc/card.h 2. Need to add include/linux/mmc/card.h into backport list in build script Signed-off-by: Owen Huang --- .../broadcom/brcm80211/brcmfmac/bcmsdh.c | 18 +++++++++--------- include/linux/mmc/card.h | 9 +++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index ba96e50ad56d..5f6d8b0ba43a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -297,11 +297,11 @@ static int brcmf_sdiod_skbuff_read(struct brcmf_sdio_dev *sdiodev, req_sz &= (uint)~3; switch (func->num) { - case 1: + case SDIO_FUNC_1: err = sdio_memcpy_fromio(func, ((u8 *)(skb->data)), addr, req_sz); break; - case 2: + case SDIO_FUNC_2: err = sdio_readsb(func, ((u8 *)(skb->data)), addr, req_sz); break; default: @@ -348,7 +348,7 @@ static int mmc_submit_one(struct mmc_data *md, struct mmc_request *mr, mc->arg |= (*addr & 0x1FFFF) << 9; /* address */ mc->arg |= md->blocks & 0x1FF; /* block count */ /* incrementing addr for function 1 */ - if (func->num == 1) + if (func->num == SDIO_FUNC_1) *addr += req_sz; mmc_set_data_timeout(md, func->card); @@ -441,7 +441,7 @@ static int brcmf_sdiod_sglist_rw(struct brcmf_sdio_dev *sdiodev, mmc_cmd.arg |= (func->num & 0x7) << 28; /* SDIO func num */ mmc_cmd.arg |= 1 << 27; /* block mode */ /* for function 1 the addr will be incremented */ - mmc_cmd.arg |= (func->num == 1) ? 1 << 26 : 0; + mmc_cmd.arg |= (func->num == SDIO_FUNC_1) ? 1 << 26 : 0; mmc_cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC; mmc_req.cmd = &mmc_cmd; mmc_req.data = &mmc_dat; @@ -1072,11 +1072,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, func->card->quirks |= MMC_QUIRK_LENIENT_FN0; /* Consume func num 1 but dont do anything with it. */ - if (func->num == 1) + if (func->num == SDIO_FUNC_1) return 0; /* Ignore anything but func 2 */ - if (func->num != 2) + if (func->num != SDIO_FUNC_2) return -ENODEV; bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL); @@ -1142,7 +1142,7 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) /* start by unregistering irqs */ brcmf_sdiod_intr_unregister(sdiodev); - if (func->num != 1) + if (func->num != SDIO_FUNC_1) return; /* only proceed with rest of cleanup if func 1 */ @@ -1205,7 +1205,7 @@ static int brcmf_ops_sdio_suspend(struct device *dev) if (!retry && config->pm_state == BRCMF_CFG80211_PM_STATE_SUSPENDING) brcmf_err("timed out wait for cfg80211 suspended\n"); - if (func->num != 1) + if (func->num != SDIO_FUNC_1) return 0; sdiodev = bus_if->bus_priv.sdio; @@ -1242,7 +1242,7 @@ static int brcmf_ops_sdio_resume(struct device *dev) int ret = 0; brcmf_dbg(SDIO, "Enter: F%d\n", func->num); - if (func->num != 2) + if (func->num != SDIO_FUNC_2) return 0; if (!sdiodev->wowl_enabled) { diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 7b12eebc5586..113d4715ab57 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -237,6 +237,15 @@ struct mmc_queue_req; #define SDIO_MAX_FUNCS 7 +#define SDIO_FUNC_0 0 +#define SDIO_FUNC_1 1 +#define SDIO_FUNC_2 2 +#define SDIO_FUNC_3 3 +#define SDIO_FUNC_4 4 +#define SDIO_FUNC_5 5 +#define SDIO_FUNC_6 6 +#define SDIO_FUNC_7 7 + /* The number of MMC physical partitions. These consist of: * boot partitions (2), general purpose partitions (4) and * RPMB partition (1) in MMC v4.4. -- 2.25.1