ath10k: fix compilation error with CONFIG_OF not available
authorAnsuel Smith <ansuelsmth@gmail.com>
Mon, 19 Jul 2021 15:58:00 +0000 (17:58 +0200)
committerPetr Štetiar <ynezz@true.cz>
Mon, 19 Jul 2021 17:10:18 +0000 (19:10 +0200)
of_platform_device_create require CONFIG_OF selected.
Add an ifdef and register to the of platform only if of is available.

Fixes: 985954ccbd11 ("kernel: add ath10k support for of_get_mac_address")
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
package/kernel/ath10k-ct/patches/203-ath10k-Try-to-get-mac-address-from-dts.patch
package/kernel/mac80211/patches/ath/984-ath10k-Try-to-get-mac-address-from-dts.patch

index dbaef20b98ccf5d975a8bf71dc4d5e32a6b7ffa8..b5c53baf67e85d1e834e6a7b01258effbefcdbcb 100644 (file)
@@ -30,15 +30,17 @@ index 5f4e12196..9ed7b9883 100644
  #include <linux/property.h>
  #include <linux/dmi.h>
  #include <linux/ctype.h>
-@@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop);
+@@ -2961,8 +2963,14 @@ EXPORT_SYMBOL(ath10k_core_stop);
  static int ath10k_core_probe_fw(struct ath10k *ar)
  {
        struct bmi_target_info target_info;
 +      const char *mac;
        int ret = 0;
  
++#ifdef CONFIG_OF
 +      /* register the platform to be found by the of api */
 +      of_platform_device_create(ar->dev->of_node, NULL, NULL);
++#endif
 +
        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
        if (ret) {
index 94eac3fa4ac34d75dbae70f7d47edf803f98107d..d0eb43fdea0704c3e6772ae72e73f473fffd4de7 100644 (file)
@@ -30,15 +30,17 @@ index 5f4e12196..9ed7b9883 100644
  #include <linux/property.h>
  #include <linux/dmi.h>
  #include <linux/ctype.h>
-@@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop);
+@@ -2961,8 +2963,14 @@ EXPORT_SYMBOL(ath10k_core_stop);
  static int ath10k_core_probe_fw(struct ath10k *ar)
  {
        struct bmi_target_info target_info;
 +      const char *mac;
        int ret = 0;
  
++#ifdef CONFIG_OF
 +      /* register the platform to be found by the of api */
 +      of_platform_device_create(ar->dev->of_node, NULL, NULL);
++#endif
 +
        ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
        if (ret) {