From patchwork Thu Oct 15 02:06:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7400631 X-Patchwork-Delegate: kvalo@adurom.com 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 29601BEEA4 for ; Thu, 15 Oct 2015 02:13:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 51AD8206F2 for ; Thu, 15 Oct 2015 02:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6565E206BC for ; Thu, 15 Oct 2015 02:13:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932806AbbJOCIF (ORCPT ); Wed, 14 Oct 2015 22:08:05 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35530 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932689AbbJOCID (ORCPT ); Wed, 14 Oct 2015 22:08:03 -0400 Received: by pacao1 with SMTP id ao1so6524398pac.2 for ; Wed, 14 Oct 2015 19:08:02 -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=G8VoK7Eq7NTQLRq7dFhzxfpi6YLuzTdgAIZd/lSlzLI=; b=Zbx8pIGt+Fp+ryQEM5MYF4uEXzT1SQLnCpNXU7jhL+J7QBB7aicsRBNoQLl9JOGl+A sHM0WpyKTnKRGSGEearmQjsmYhBHiRmNbzxkhnF7CRSrSH4zQ2Nb8l/5oPMm/Nx1evdg u9dp1+mAuDsW98YJtyo+VlvTIDEWxExtx9VAHZqQFOQZCX/NH/Onuk8poIBBRngnB6O5 AHCbJ+OgEeM7bEJI5ya9rc15LVxhE4f3t8u0co17eKnOE+Ie185oLyedYMLnzvZIC8pJ nFpV5loVFVMGDb71e5xdZwJRbrXfP3uDhng6PJef/k4IJhzXVLScso7pqICAVWseesTA 4Omg== X-Received: by 10.68.98.99 with SMTP id eh3mr7144552pbb.126.1444874882616; Wed, 14 Oct 2015 19:08:02 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id nv2sm11997253pbc.48.2015.10.14.19.07.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 19:08:02 -0700 (PDT) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, rachel.kim@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, linux-wireless@vger.kernel.org, Chaehyun Lim Subject: [PATCH 19/33] staging: wilc1000: fix return type of host_int_remain_on_channel Date: Thu, 15 Oct 2015 11:06:48 +0900 Message-Id: <1444874822-31152-19-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444874822-31152-1-git-send-email-chaehyun.lim@gmail.com> References: <1444874822-31152-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 changes return type of host_int_remain_on_channel from s32 to int. s32Error gets return value from wilc_mq_send that has return type of int. It should be changed return type of this function as well as data type of s32Error. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/host_interface.c | 4 ++-- drivers/staging/wilc1000/host_interface.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index f251186..47927b3 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4514,13 +4514,13 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length) } -s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, +int host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg) { - s32 s32Error = 0; + int s32Error = 0; struct host_if_msg msg; if (!hif_drv) { diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 71f04ef..b7fe538 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -1114,7 +1114,7 @@ s32 host_int_get_ipaddress(struct host_if_drv *hWFIDrv, u8 *pu8IPAddr, u8 idx); * @date * @version 1.0 */ -s32 host_int_remain_on_channel(struct host_if_drv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg); +int host_int_remain_on_channel(struct host_if_drv *hWFIDrv, u32 u32SessionID, u32 u32duration, u16 chan, wilc_remain_on_chan_expired RemainOnChanExpired, wilc_remain_on_chan_ready RemainOnChanReady, void *pvUserArg); /** * @brief host_int_ListenStateExpired