From 5c72cf67df9ffaf5c94a6a94df044fb2834dc3f9 Mon Sep 17 00:00:00 2001 From: Owen Huang Date: Mon, 27 Mar 2023 01:47:54 -0500 Subject: [PATCH 146/296] brcmfmac: move SDIO function number definition to sdio.h 1. adding include/linux/mmc/card.h into backport list will cause sdio probe failed Signed-off-by: Owen Huang --- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.h | 10 ++++++++++ include/linux/mmc/card.h | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h index fa4838617805..330c8cdfcae7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h @@ -147,6 +147,16 @@ /* watchdog polling interval */ #define BRCMF_WD_POLL msecs_to_jiffies(10) +/* SDIO function number definition */ +#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 + /** * enum brcmf_sdiod_state - the state of the bus. * diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 113d4715ab57..7b12eebc5586 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -237,15 +237,6 @@ 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