Commit 25ad41cb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

staging/wilc1000: remove linux_wlan_{device_power,device_detection}

The driver provides an interface for custom power management
and detection that is meant to be filled by people customizing
the driver. The default implementation of this is empty, and
we don't actually want people to have to modify the source code.

If anybody needs this, they need to describe the respective
hardware specifics using device tree or platform data and make
the driver handle this is a more general way.

This removes the empty stubs.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15162fbc
...@@ -31,40 +31,6 @@ ...@@ -31,40 +31,6 @@
#include "linux_wlan_spi.h" #include "linux_wlan_spi.h"
#endif #endif
#define _linux_wlan_device_power_on() {}
#define _linux_wlan_device_power_off() {}
#define _linux_wlan_device_detection() {}
#define _linux_wlan_device_removal() {}
static int linux_wlan_device_power(int on_off)
{
PRINT_D(INIT_DBG, "linux_wlan_device_power.. (%d)\n", on_off);
if (on_off) {
_linux_wlan_device_power_on();
} else {
_linux_wlan_device_power_off();
}
return 0;
}
static int linux_wlan_device_detection(int on_off)
{
PRINT_D(INIT_DBG, "linux_wlan_device_detection.. (%d)\n", on_off);
#ifdef WILC_SDIO
if (on_off) {
_linux_wlan_device_detection();
} else {
_linux_wlan_device_removal();
}
#endif
return 0;
}
static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr); static int dev_state_ev_handler(struct notifier_block *this, unsigned long event, void *ptr);
static struct notifier_block g_dev_notifier = { static struct notifier_block g_dev_notifier = {
...@@ -1476,8 +1442,6 @@ void wl_wlan_cleanup(struct wilc *wilc) ...@@ -1476,8 +1442,6 @@ void wl_wlan_cleanup(struct wilc *wilc)
#if defined(WILC_DEBUGFS) #if defined(WILC_DEBUGFS)
wilc_debugfs_remove(); wilc_debugfs_remove();
#endif #endif
linux_wlan_device_detection(0);
linux_wlan_device_power(0);
} }
int wilc_netdev_init(struct wilc **wilc) int wilc_netdev_init(struct wilc **wilc)
...@@ -1579,10 +1543,6 @@ static int __init init_wilc_driver(void) ...@@ -1579,10 +1543,6 @@ static int __init init_wilc_driver(void)
printk("IN INIT FUNCTION\n"); printk("IN INIT FUNCTION\n");
printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n"); printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n");
linux_wlan_device_power(1);
msleep(100);
linux_wlan_device_detection(1);
#ifdef WILC_SDIO #ifdef WILC_SDIO
{ {
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment