From patchwork Tue Nov 10 23:42:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7592991 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 108B59F830 for ; Tue, 10 Nov 2015 23:48:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39672205FF for ; Tue, 10 Nov 2015 23:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58DA5205F9 for ; Tue, 10 Nov 2015 23:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752452AbbKJXsO (ORCPT ); Tue, 10 Nov 2015 18:48:14 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:61254 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbbKJXm7 (ORCPT ); Tue, 10 Nov 2015 18:42:59 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LqFFo-1aZm6n1yds-00dki7; Wed, 11 Nov 2015 00:42:53 +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 08/20] staging/wilc1000: remove linux_wlan_{device_power, device_detection} Date: Wed, 11 Nov 2015 00:42:28 +0100 Message-Id: <1447198960-2760143-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447198960-2760143-1-git-send-email-arnd@arndb.de> References: <1447198960-2760143-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:FDuWONhE6+sRuLZtWfMpIMDg92/kLfH8DdW5B+acN73opecsVtU U1SoAqWjrxZSc6AbyvIo6JBFbHJ6dTMCFz6ChbahMi+utU+LUQfzKWMiG+bG++v61Nr45Ft a1L60ivChex5AZjjEmR7NA82hB5ni9KIly3S43YqrCMOmnMvo6air4KOS+dSpanx7j7FjWz +6mF6p3+ALmAS84DWCUGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:GcJOseGiFas=:QZH2sMwjJjaTZ3wUpg6z7S ECuHSgRl4EjRw1UKFiUWmq/DpFVKZAf1PVg1hiQgcgMtcNOlEyzfHu4uziELTincwZ+t9BwON f2FoBvzLGnuFMqiiDM0aLyI7dI44kmfcX7UuBO9SQ3hCxUlrcmHz7jqhqk9Sh4TZvmpfN33GS cmPE7wWo8LcGM9SpCM+xRjOQwUzwr9ACxDp8Slgy04NWCjSPd6F8baH95xF6sHFZUKvCF9kZ/ 8/wXURBSK8eqTe+4zMbftMd0LyaRHTPI9h++9LYhY+mgiW8WsYRDvDBxQIiwIuZsOupfnp7aq RMD05D1qC7guIqrted02uLIJy8bPTXa69uSuBfLWt8czKXMJmupDEa3ELNeL7Bib2nkYNdWXn oy6FjJ3YEApXfk89WeziwGWQfm7MUKiV2dqZhdn1KihuUYyt3tUjek4F546SveHhPvM+/mCXn 6n+cWH9k5r1xnbs43Q//5GOqTRll7RSoK7qNxsNBq4R0n9x+6QSHaAa4JhK5OHlc3HLGuCzG2 +r8zGXxgee7/12Jaf3i8iFMA77ZDJpatTg2aDdHqUOtA7JcVbjAU5mn7JfTUdrTqhj0K9NUxO TSOnG5mWZYohxS5CBQkDYcFy7Vv8e7te43DHw+MVXXc/O//QRp4uaLP5nZR6GcuZlcLXz7V5R NO4uXImeGL4SUL6lm96RaSkuBSVWNRnmUS8XLb8Jf5quwT+4xrBDnfhZp/wiBZTN7Glw= 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.2 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;