staging: wilc1000: Compilation errors if compilation switches are disabled

Compilation and linking erros are observed if compilation switches
DISABLE_PWRSAVE_AND_SCAN_DURING_IP and WILC_DEBUGFS aren't defiend

Fixes analogdevicesinc#41

Signed-off-by: Adham Abozaeid <[email protected]>

Author: Adham Abozaeid

drivers/staging/wilc1000/host_interface.c

@@ -2589,8 +2589,10 @@ int wilc_set_power_mgmt(struct wilc_vif *vif, bool enabled, u32 timeout)
 				      wilc_get_vif_idx(vif));
 	if (result)
 		PRINT_ER(vif->ndev, "Failed to send power management\n");
+#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 	else
 		store_power_save_current_state(vif, power_mode);
+#endif
 
 	return result;
 }
@@ -2619,6 +2621,7 @@ int wilc_setup_multicast_filter(struct wilc_vif *vif, u32 enabled, u32 count,
 	return result;
 }
 
+#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 void handle_powersave_state_changes(struct work_struct *work)
 {
 	struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
@@ -2646,6 +2649,7 @@ void wilc_powersave_state_changes(struct wilc_vif *vif)
 		kfree(msg);
 	}
 }
+#endif
 
 int wilc_set_tx_power(struct wilc_vif *vif, u8 tx_power)
 {

drivers/staging/wilc1000/wilc_debugfs.c

@@ -4,16 +4,16 @@
  * All rights reserved.
  */
 
-#if defined(WILC_DEBUGFS)
 #include <linux/module.h>
 #include <linux/debugfs.h>
 
 #include "wilc_debugfs.h"
 
-static struct dentry *wilc_dir;
-
 atomic_t WILC_DEBUG_REGION = ATOMIC_INIT(INIT_DBG);
 
+#if defined(WILC_DEBUGFS)
+static struct dentry *wilc_dir;
+
 static ssize_t wilc_debug_region_read(struct file *file, char __user *userbuf,
 				     size_t count, loff_t *ppos)
 {

drivers/staging/wilc1000/wilc_netdev.c

@@ -20,12 +20,12 @@
 #include "wilc_netdev.h"
 #include "wilc_wfi_cfgoperations.h"
 
+#define WILC_MULTICAST_TABLE_SIZE	8
+
 #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 bool g_ignore_PS_state;
 #define WILC_IP_TIMEOUT_MS		15000
 
-#define WILC_MULTICAST_TABLE_SIZE	8
-
 void handle_pwrsave_for_IP(struct wilc_vif *vif, uint8_t state)
 {
 	struct wilc_priv *priv;
@@ -1557,7 +1557,9 @@ void wilc_netdev_cleanup(struct wilc *wilc)
 	destroy_workqueue(wilc->hif_workqueue);
 	wilc->hif_workqueue = NULL;
 	cfg_deinit(wilc);
+#ifdef WILC_DEBUGFS
 	wilc_debugfs_remove();
+#endif
 	wilc_sysfs_exit();
 	wlan_deinit_locks(wilc);
 	kfree(wilc->bus_data);
@@ -1586,10 +1588,12 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
 	if (ret)
 		goto free_locks;
 
+#ifdef WILC_DEBUGFS
 	if (wilc_debugfs_init()) {
 		ret = -ENOMEM;
 		goto free_cfg;
 	}
+#endif
 	wl->io_type = io_type;
 	wl->hif_func = ops;
 
@@ -1673,12 +1677,16 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
 			}
 		}
 	}
+#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 	unregister_inetaddr_notifier(&g_dev_notifier);
+#endif
 	destroy_workqueue(wl->hif_workqueue);
 
 free_debug_fs:
+#ifdef WILC_DEBUGFS
 	wilc_debugfs_remove();
 free_cfg:
+#endif
 	cfg_deinit(wl);
 free_locks:
 	wlan_deinit_locks(wl);

drivers/staging/wilc1000/wilc_netdev.h

@@ -20,14 +20,15 @@
 
 extern int wait_for_recovery;
 
+#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 void handle_pwrsave_for_IP(struct wilc_vif *vif, uint8_t state);
 void store_power_save_current_state(struct wilc_vif *vif, bool val);
 #if KERNEL_VERSION(4, 15, 0) <= LINUX_VERSION_CODE
 void clear_during_ip(struct timer_list *t);
 #else
 void clear_during_ip(unsigned long arg);
 #endif
-
+#endif //DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 struct net_device *wilc_get_if_netdev(struct wilc *wilc, uint8_t ifc);
 struct host_if_drv *get_drv_hndl_by_ifc(struct wilc *wilc, uint8_t ifc);
 

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

@@ -1661,6 +1661,7 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 		return -EIO;
 	}
 
+#ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 	/* Can't set PS during obtaining IP */
 	if (vif->obtaining_ip == true) {
 		PRINT_ER(dev,
@@ -1673,7 +1674,7 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
 
 		return 0;
 	}
-
+#endif
 	PRINT_INFO(vif->ndev, CFG80211_DBG,
 		   " Power save Enabled= %d , TimeOut = %d\n", enabled,
 		   timeout);