Path: csiph.com!goblin2!goblin.stu.neva.ru!gothmog.csi.it!bofh.it!news.nic.it!robomod From: Arnd Bergmann Newsgroups: linux.kernel Subject: [PATCH 07/19] staging/wilc1000: remove linux_wlan_{device_power,device_detection} Date: Wed, 21 Oct 2015 01:00:03 +0200 Message-ID: References: X-Original-To: linux-wireless@vger.kernel.org X-Mailer: git-send-email 2.1.0.rc2 X-Provags-ID: V03:K0:Tn9F2m7Xz1e6S8YBEIQnS/QdboYcGHZ8Slld2v7ZbpED9dcYzuv UeX3Gwsg+5JN/hz9mf5d5X5G8l9oeFKiFqs4fZwtLjpfkjrQ2j5qQke3U9miKbVI3oZCxIO Q0khXF0GhTVKni83FUMLEUQzTjFSgjqx1iaesLwh1GuhEPpILLgpC53UmWpeH1bJW31Srdp s97DPo/YI2Gdw6kBacGIQ== X-Ui-Out-Filterresults: notjunk:1;V01:K0:Np+dtc78/PE=:NZu6o7HjtZJqEx3eOSyHdh 2VgNBkqiXrpbvsDxOha3XMaraKTH6ly4taJ66Zo6Wjqz113J2oJQ1b0Kc38ne+QN74LhmZ16w iLkFhP+1XTTaXDzsHa3t29m07jc/SFbtkOI7VvgY0M01FzCsDq/mLQcSqECs6lge+9x7tdoRY FILMb7nc/39yLN35cEeJAK94IAyTO2LiwQMEFyZhBnuKlprWC0t70XstH+QbEHfaS07rxcyYd 0f46agKD70AGgSxUxjrw9iZQavBS4565n6GB/Td5WZGlvZqj+JJsEA/4xOMq7Ooc+Byb0M1Re 1ewrJxpO10CTUZDHKO+0Rl7tAayNyBFIA9tG1/kpXSuLM1hm2vJlCR4Fsk79tPoRZLk1v4wx5 K0wBN7+WZcFhWFASRN7S1a+cF2UsPH5ZwWdKKcE/ctNy47Q6OHbetkIzNV9Pky5ak3w8q9YlY nU2+y8j//CBkaBLndEtGa7HdliZXAFtKh8bdsm8xqb/OLcGO8m5AculAcM3CcWAOs1ZmSSCqf E9XVXN5LRJ7xqpJovVPuADJwDFJ9+SbAExA1sOmzY4hmfvg4si6CitebIUwjT/mCNp/BrN0wt ND7WYt1zyx6qnYAF6f0yOFptnZnu7Z7KJZYGrqj3EooFt6knxTxndHPqZoNRGyUQzKivRTqXI WY8gTiwzkip8XzyRQ5z/qe6sky211cQtiytYryarpxwg6PqF2LiL+y3qjOUzhfbKeA10= Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 125 Organization: linux.* mail to news gateway X-Original-Cc: Rachel Kim , devel@driverdev.osuosl.org, Chris Park , gregkh@linuxfoundation.org, Stanislav Kholmanskikh , Johnny Kim , linux-kernel@vger.kernel.org, Tony Cho , Glen Lee , Leo Kim , Arnd Bergmann X-Original-Date: Wed, 21 Oct 2015 00:47:26 +0200 X-Original-Message-ID: <1445381258-1455986-8-git-send-email-arnd@arndb.de> X-Original-References: <1445381258-1455986-1-git-send-email-arnd@arndb.de> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1252334 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: Arnd Bergmann --- drivers/staging/wilc1000/linux_wlan.c | 62 ----------------------------------- 1 file changed, 62 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index d3cc255cd91b..eb4c6cba4575 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -32,47 +32,6 @@ #include "linux_wlan_spi.h" #endif -#if defined(CUSTOMER_PLATFORM) -/* - TODO : Write power control functions as customer platform. - */ -#else - - #define _linux_wlan_device_power_on() {} - #define _linux_wlan_device_power_off() {} - - #define _linux_wlan_device_detection() {} - #define _linux_wlan_device_removal() {} -#endif - -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 struct notifier_block g_dev_notifier = { @@ -1046,12 +1005,6 @@ static u8 wilc1000_prepare_11b_core(wilc_wlan_inp_t *nwi, struct wilc *nic) wilc_wlan_global_reset(); sdio_unregister_driver(&wilc_bus); - linux_wlan_device_detection(0); - - mdelay(100); - - linux_wlan_device_detection(1); - sdio_register_driver(&wilc_bus); while (!wilc1000_probe) @@ -1076,14 +1029,6 @@ static int repeat_power_cycle(perInterface_wlan_t *nic) sdio_unregister_driver(&wilc_bus); - linux_wlan_device_detection(0); - linux_wlan_device_power(0); - msleep(100); - linux_wlan_device_power(1); - msleep(80); - linux_wlan_device_detection(1); - msleep(20); - sdio_register_driver(&wilc_bus); /* msleep(1000); */ @@ -1794,10 +1739,6 @@ static int __init init_wilc_driver(void) printk("IN INIT FUNCTION\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 { int ret; @@ -1877,9 +1818,6 @@ static void __exit exit_wilc_driver(void) #if defined(WILC_DEBUGFS) wilc_debugfs_remove(); #endif - - linux_wlan_device_detection(0); - linux_wlan_device_power(0); } module_exit(exit_wilc_driver); -- 2.1.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/