From patchwork Mon Jun 13 10:37:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 69866 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1472599qgf; Mon, 13 Jun 2016 03:38:51 -0700 (PDT) X-Received: by 10.66.170.168 with SMTP id an8mr21091821pac.47.1465814325283; Mon, 13 Jun 2016 03:38:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s1si17288593pan.105.2016.06.13.03.38.45; Mon, 13 Jun 2016 03:38:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422796AbcFMKin (ORCPT + 30 others); Mon, 13 Jun 2016 06:38:43 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:32964 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422767AbcFMKij (ORCPT ); Mon, 13 Jun 2016 06:38:39 -0400 Received: by mail-pa0-f53.google.com with SMTP id b13so22374801pat.0 for ; Mon, 13 Jun 2016 03:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PanyUT7ke9tQnbOTD79OE7pgq7bQWNxoNNPvkfi8rws=; b=Xh5Snqdbhx3YfI4/KbWiy1B5BypN0md4hei7b+BlEk9oOMd7G9I5pdoeWlGxb7/ksx xi2urSoiwW8F3dJ7bA8hck0GTX/tKlouFGjzh9E8329e+pPVU004Hk3A+Bh8uWvwv9b4 VrIbz8NRukBdK3kLoDJpd7FyqFZATLVI1Tnr8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PanyUT7ke9tQnbOTD79OE7pgq7bQWNxoNNPvkfi8rws=; b=Y8pG/wCYR72bWCRINfrOQJSLutObGYMu2HcYV/2769w8qrQc2v9dDea2CA/0Pv6rfN Vw41LMFhdVgegk8DLzj4RXsfxg8rXrw3YXHcj+/bEf66dphw/eR9eedHwlCjcBb1O9hu xqGzjLEcnlbSe+ivQBg+lGic00lFsWu4MnKVw/groIGjqHlO/IfuMbp9BrB1gU9nrj6b 2jDMUno2bcjUrKHLrJ+FGWi29pXt8Ey/PpyuYVFb8ICFL9I42awgrldIQ7Hfyx3FHLAU WS4fzfXjMLCb35mc6VBzdvQQe/18eeANX2pnldQkLAoiyxSUDSXIN7kG9k828qRorQik 4WZg== X-Gm-Message-State: ALyK8tJP5LjqeYvJwZv+epHiWWyZiOIhTqPj7iwTyFGSG4OIZiKycBZh60xDMHLpEAC7agc2 X-Received: by 10.66.73.232 with SMTP id o8mr16687430pav.43.1465814318537; Mon, 13 Jun 2016 03:38:38 -0700 (PDT) Received: from localhost.localdomain ([116.68.103.40]) by smtp.gmail.com with ESMTPSA id h6sm24194895pac.46.2016.06.13.03.38.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Jun 2016 03:38:38 -0700 (PDT) From: Binoy Jayan To: Greg Kroah-Hartman Cc: Arnd Bergmann , Johnny Kim , Austin Shin , Chris Park , Tony Cho , Glen Lee , Leo Kim , devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH 7/7] staging: wilc1000: Remove unused inclusion of semaphore header Date: Mon, 13 Jun 2016 16:07:39 +0530 Message-Id: <1465814259-3009-8-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1465814259-3009-1-git-send-email-binoy.jayan@linaro.org> References: <1465814259-3009-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unused inclusions of semaphore header and remove the same from the todo list. Also remove the now unused wrapper 'wilc_lock_timeout'. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- drivers/staging/wilc1000/TODO | 1 - drivers/staging/wilc1000/linux_wlan.c | 12 ------------ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 3 +-- drivers/staging/wilc1000/wilc_wlan.h | 2 +- drivers/staging/wilc1000/wilc_wlan_if.h | 1 - 5 files changed, 2 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/drivers/staging/wilc1000/TODO b/drivers/staging/wilc1000/TODO index 95199d8..83e66b2 100644 --- a/drivers/staging/wilc1000/TODO +++ b/drivers/staging/wilc1000/TODO @@ -3,7 +3,6 @@ TODO: - remove OS wrapper functions - remove custom debug and tracing functions - rework comments and function headers(also coding style) -- replace all semaphores with mutexes or completions - make spi and sdio components coexist in one build - turn compile-time platform configuration (BEAGLE_BOARD, PANDA_BOARD, PLAT_WMS8304, PLAT_RKXXXX, CUSTOMER_PLATFORM, ...) diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index ac537c7..66c1dd7 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -21,7 +21,6 @@ #include #include #include -#include #include static int dev_state_ev_handler(struct notifier_block *this, @@ -221,17 +220,6 @@ static void deinit_irq(struct net_device *dev) } } -int wilc_lock_timeout(struct wilc *nic, void *vp, u32 timeout) -{ - /* FIXME: replace with mutex_lock or wait_for_completion */ - int error = -1; - - if (vp) - error = down_timeout(vp, - msecs_to_jiffies(timeout)); - return error; -} - void wilc_mac_indicate(struct wilc *wilc, int flag) { int status; diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 5cc6a82..b1db761 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -131,7 +131,7 @@ struct wilc_priv { struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA]; u8 wilc_groupkey; - /* semaphores */ + /* locks */ struct mutex scan_req_lock; /* */ bool gbAutoRateAdjusted; @@ -225,7 +225,6 @@ int wilc1000_wlan_init(struct net_device *dev, struct wilc_vif *vif); void wilc_frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset); void wilc_mac_indicate(struct wilc *wilc, int flag); -int wilc_lock_timeout(struct wilc *wilc, void *, u32 timeout); void wilc_netdev_cleanup(struct wilc *wilc); int wilc_netdev_init(struct wilc **wilc, struct device *, int io_type, int gpio, const struct wilc_hif_func *ops); diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index 30e5312..de6c4dd 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -192,7 +192,7 @@ #define ENABLE_RX_VMM (SEL_VMM_TBL1 | EN_VMM) #define ENABLE_TX_VMM (SEL_VMM_TBL0 | EN_VMM) -/*time for expiring the semaphores of cfg packets*/ +/*time for expiring the completion of cfg packets*/ #define CFG_PKTS_TIMEOUT 2000 /******************************************** * diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h index 410bfc0..439ac6f 100644 --- a/drivers/staging/wilc1000/wilc_wlan_if.h +++ b/drivers/staging/wilc1000/wilc_wlan_if.h @@ -10,7 +10,6 @@ #ifndef WILC_WLAN_IF_H #define WILC_WLAN_IF_H -#include #include /********************************************