From patchwork Mon Nov 16 14:04:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7627581 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8A175BF90C for ; Mon, 16 Nov 2015 14:11:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BAC1B204EA for ; Mon, 16 Nov 2015 14:11:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8568204D6 for ; Mon, 16 Nov 2015 14:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752238AbbKPOLH (ORCPT ); Mon, 16 Nov 2015 09:11:07 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:60088 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbbKPOLE (ORCPT ); Mon, 16 Nov 2015 09:11:04 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0LwVGF-1aS5bL2P6t-018JQK; Mon, 16 Nov 2015 15:05:20 +0100 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Johnny Kim , Austin Shin , Chris Park , Tony Cho , Glen Lee , Leo Kim , linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 07/19] staging/wilc1000: remove linux_wlan_{device_power, device_detection} Date: Mon, 16 Nov 2015 15:04:58 +0100 Message-Id: <1447682710-2908925-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447682710-2908925-1-git-send-email-arnd@arndb.de> References: <1447682710-2908925-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Y2Fkg2r3hDoWp+p0ydD7SQElUYc1pnPHTG9UPaIuEBGNCfKIofT WG4fpgM8TUjp0f3gO3yLaKxCADrIfbxHNMba9sS0JSftTikNO/z4PeRaGXaW6WQ2U/Cjo87 WlgitDG4XGGd+PbpTh7GocaRAYXDDG/MXpl3efl/zU3Q/U4v1tiGjIHSgHrk1ETeAhm+eQ2 nTN/HSJLPmZrh47zF+yew== X-UI-Out-Filterresults: notjunk:1; V01:K0:gZdsS00VdHI=:xG2A49D9G/SqCI9Amds6K1 hC/HUo6x9nkLlGIT4kUq6QUINAbDi68zu/s+i9moC1eFXbTDGvY41SYj/zvHinqHX2O/Qtvik w7xE5wtAOBO7MBOocQD240WnZEr+4GvJH0Ogk3wFkZ+conMauDT2+bnYxvtMZorXzJr+1+u5L +Msy8FDuazTayVockX3nCVCSD4Kz7xJp/Ad0njNPYtbmJ38yedZFJLGI68x82ni7z6fO5L29m XwyrHIDdSfDF6KzU71wQwz1W2pMoc5Vgpgv4sXaSKCxE7VdABlpGxi9lnA2iIsqiDmFt4AnEn af9/OaQfqjkDbI4spKig135vb2bn7bAdqtxLeCk8c/UY1J9XkX36yBInJS9YCIEt/LKNUFrHq 10+oWQ5OgGe93xnABCCzkmJTWFhOknYH/e9IUVVHIlyuuql6OgPy6+IBHg7ZrQZ7uEFp0AIWt O1cvLszRkVciqUB8z4NQCZ5wHdTwlp4WHV7UdPHpe4dtlXAHcAd6y7D3GMm/9ggfiNyL519K4 S2izi5EalQH2+8DBC2lLDyS/y1uUIfWrm4fRPrkAVPIYAokDjisSlfbcWdNjCrxd3Sa1KZY1D +ejG3tM/Cp5Wn9PzfMXPc34SekXdCTUEWAWIHQnOWbVukW8dWHOGRWKsvgGQ8R4dp+Vc7VmTG 8/Gj+ZlUs1m91RgY5sRv7n0aS+uhkcHZo9ZTf4cYufKn4Zz9U6kHlVAWAjmmYu55Xyms= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, TVD_SUBJ_WIPE_DEBT, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 40 ----------------------------------- 1 file changed, 40 deletions(-) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 040caa0d0d0b..6e1ef99fc856 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -31,40 +31,6 @@ #include "linux_wlan_spi.h" #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 struct notifier_block g_dev_notifier = { @@ -1476,8 +1442,6 @@ void wl_wlan_cleanup(struct wilc *wilc) #if defined(WILC_DEBUGFS) wilc_debugfs_remove(); #endif - linux_wlan_device_detection(0); - linux_wlan_device_power(0); } int wilc_netdev_init(struct wilc **wilc) @@ -1579,10 +1543,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;