From patchwork Tue Sep 8 15:56:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7142351 X-Patchwork-Delegate: kvalo@adurom.com 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 9877D9F1BF for ; Tue, 8 Sep 2015 15:57:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BFE6020670 for ; Tue, 8 Sep 2015 15:57:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF0C02066C for ; Tue, 8 Sep 2015 15:57:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755385AbbIHP5Q (ORCPT ); Tue, 8 Sep 2015 11:57:16 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33300 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755373AbbIHP5P (ORCPT ); Tue, 8 Sep 2015 11:57:15 -0400 Received: by pacex6 with SMTP id ex6so127503990pac.0 for ; Tue, 08 Sep 2015 08:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D9GNM4M3brgm6QJypKrDIaBaVt3cW9y8My3YaA6Mqq8=; b=oVLqg/1EMs9Rw+smwWyEAFMR+nyQ9nKmO4NnJ9bb5ks4e4AxAxlE7lGNcG58HfHEYW 1mITFu3h8IciS7SqWRaS1Jr4goD8V5N0yTZMb19yg9Sy5/HfdvBDoWuphJAXf6Pkvv6Q 8iT/IcNUoFuKS5Z/vMw0IUYXo9jLFFgVLIcn/pjIvAH7mzyfu62Wll05kFLDZapNa549 5s0ddGwICUYNLir90UmomELAXqYzd9fq6Bbvn9KlQRwcKibg8hq9W1FA3LFDmUWn66MO In+M0ekGw8cQE++xRSjuW6jn5bDhPCf2pyYb7c8rgOUDYmffS8VZmvjLsiKQLncLlOOR r3gw== X-Received: by 10.66.101.39 with SMTP id fd7mr49118228pab.3.1441727835011; Tue, 08 Sep 2015 08:57:15 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id ch3sm3899425pbb.18.2015.09.08.08.57.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Sep 2015 08:57:14 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, chris.park@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH 25/30] staging: wilc1000: rename WILC_WFI_cancel_remain_on_channel Date: Wed, 9 Sep 2015 00:56:02 +0900 Message-Id: <1441727767-26026-25-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441727767-26026-1-git-send-email-chaehyun.lim@gmail.com> References: <1441727767-26026-1-git-send-email-chaehyun.lim@gmail.com> 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 This patch replaces WILC_WFI_cancel_remain_on_channel with wilc_cfg80211_cancel_remain_on_channel to avoid CamelCase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index f071389..3e6af0c 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2444,7 +2444,7 @@ static int wilc_cfg80211_remain_on_channel(struct wiphy *wiphy, } /** - * @brief WILC_WFI_cancel_remain_on_channel + * @brief wilc_cfg80211_cancel_remain_on_channel * @details Cancel an on-going remain-on-channel operation. * This allows the operation to be terminated prior to timeout based on * the duration value. @@ -2456,7 +2456,7 @@ static int wilc_cfg80211_remain_on_channel(struct wiphy *wiphy, * @date 01 MAR 2012 * @version 1.0 */ -static int WILC_WFI_cancel_remain_on_channel(struct wiphy *wiphy, +static int wilc_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev, u64 cookie) { @@ -3635,7 +3635,7 @@ static struct cfg80211_ops WILC_WFI_cfg80211_ops = { .flush_pmksa = wilc_cfg80211_flush_pmksa, #ifdef WILC_P2P .remain_on_channel = wilc_cfg80211_remain_on_channel, - .cancel_remain_on_channel = WILC_WFI_cancel_remain_on_channel, + .cancel_remain_on_channel = wilc_cfg80211_cancel_remain_on_channel, .mgmt_tx_cancel_wait = WILC_WFI_mgmt_tx_cancel_wait, .mgmt_tx = WILC_WFI_mgmt_tx, .mgmt_frame_register = WILC_WFI_frame_register,