diff mbox series

[5.12] iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM is disabled

Message ID 1614236661-20274-1-git-send-email-kvalo@codeaurora.org
State Accepted
Commit 62541e266703549550e77fd46138422dbdc881f1
Delegated to: Kalle Valo
Headers show
Series [5.12] iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM is disabled | expand

Commit Message

Kalle Valo Feb. 25, 2021, 7:04 a.m. UTC
Randy reported an error on his randconfig builds:

ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!

The problem was that when CONFIG_IWLMVM was disabled we were still accessing
iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Luca Coelho Feb. 25, 2021, 7:10 a.m. UTC | #1
On Thu, 2021-02-25 at 09:04 +0200, Kalle Valo wrote:
> Randy reported an error on his randconfig builds:
> 
> ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!
> 
> The problem was that when CONFIG_IWLMVM was disabled we were still accessing
> iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> ---

Thanks for the fix, Kalle! Please take it directly to wireless-drivers.

Acked-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.
Randy Dunlap Feb. 25, 2021, 4:46 p.m. UTC | #2
On 2/24/21 11:04 PM, Kalle Valo wrote:
> Randy reported an error on his randconfig builds:
> 
> ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!
> 
> The problem was that when CONFIG_IWLMVM was disabled we were still accessing
> iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Thanks.

> ---
>  drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> index 314fec4a89ad..ffaf973dae94 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> @@ -1106,6 +1106,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  		}
>  	}
>  
> +#if IS_ENABLED(CONFIG_IWLMVM)
> +
>  	/*
>  	 * Workaround for problematic SnJ device: sometimes when
>  	 * certain RF modules are connected to SnJ, the device ID
> @@ -1116,7 +1118,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	if (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ)
>  		iwl_trans->trans_cfg = &iwl_so_trans_cfg;
>  
> -#if IS_ENABLED(CONFIG_IWLMVM)
>  	/*
>  	 * special-case 7265D, it has the same PCI IDs.
>  	 *
>
Kalle Valo Feb. 25, 2021, 6:23 p.m. UTC | #3
Kalle Valo <kvalo@codeaurora.org> writes:

> Randy reported an error on his randconfig builds:
>
> ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!
>
> The problem was that when CONFIG_IWLMVM was disabled we were still accessing
> iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
Kalle Valo Feb. 26, 2021, 7:35 a.m. UTC | #4
Kalle Valo <kvalo@codeaurora.org> wrote:

> Randy reported an error on his randconfig builds:
> 
> ERROR: modpost: "iwl_so_trans_cfg" [drivers/net/wireless/intel/iwlwifi/iwlwifi.ko] undefined!
> 
> The problem was that when CONFIG_IWLMVM was disabled we were still accessing
> iwl_so_trans_cfg. Fix it by moving IS_ENABLED() check before the access.
> 
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Fixes: 930be4e76f26 ("iwlwifi: add support for SnJ with Jf devices")
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> Acked-by: Luca Coelho <luciano.coelho@intel.com>
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Patch applied to wireless-drivers.git, thanks.

62541e266703 iwlwifi: pcie: fix iwl_so_trans_cfg link error when CONFIG_IWLMVM is disabled
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 314fec4a89ad..ffaf973dae94 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1106,6 +1106,8 @@  static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		}
 	}
 
+#if IS_ENABLED(CONFIG_IWLMVM)
+
 	/*
 	 * Workaround for problematic SnJ device: sometimes when
 	 * certain RF modules are connected to SnJ, the device ID
@@ -1116,7 +1118,6 @@  static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (CSR_HW_REV_TYPE(iwl_trans->hw_rev) == IWL_CFG_MAC_TYPE_SNJ)
 		iwl_trans->trans_cfg = &iwl_so_trans_cfg;
 
-#if IS_ENABLED(CONFIG_IWLMVM)
 	/*
 	 * special-case 7265D, it has the same PCI IDs.
 	 *