From patchwork Thu Oct 15 02:07:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7400321 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 DD07CBEEA4 for ; Thu, 15 Oct 2015 02:08:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13C6220832 for ; Thu, 15 Oct 2015 02:08:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10BD32083A for ; Thu, 15 Oct 2015 02:08:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964810AbbJOCIl (ORCPT ); Wed, 14 Oct 2015 22:08:41 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:36642 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964788AbbJOCIk (ORCPT ); Wed, 14 Oct 2015 22:08:40 -0400 Received: by pabws5 with SMTP id ws5so7362956pab.3 for ; Wed, 14 Oct 2015 19:08:40 -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=lRwxqnur0VgAQzGu/h46EE9T/jxCVhFsh47mCXolkN8=; b=UJkmRjQZoCSp3e5lFmQ4QSIytSzxHm3y0pNmflWg9HLf3klvJy/uIv538i+YjU35nQ UmPhdQVJXo1Fx3+lrkWMm4BMaoDuuzKIij5b+NvM9lmF1OFA9Hg+Sfrs60uJO8WKVFYk jIVDVTUsm6tEHfwz14EncDN2Tg4aS4nfkNZT3yB/Bo7snJladzAZrTqitSLT83QLgwOJ bjDc3ydoC8KsHv0AeKZmFnMnPU++R86HOW45u1ym0SQbzzGfNEqfTcG2zvf+b2ti3Ktt YoBtapydWisqlLP6Y1fsiYYKIYERqGjMymSq3RsuLi41vdeB3PDSJAsd4uyhnAv2tCyU 5MBA== X-Received: by 10.68.216.135 with SMTP id oq7mr7210157pbc.9.1444874920336; Wed, 14 Oct 2015 19:08:40 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id nv2sm11997253pbc.48.2015.10.14.19.08.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 19:08:39 -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 32/33] staging: wilc1000: fix return type of host_int_scan Date: Thu, 15 Oct 2015 11:07:01 +0900 Message-Id: <1444874822-31152-32-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_scan 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 f419ce7..c1125f8 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4012,13 +4012,13 @@ int host_int_get_statistics(struct host_if_drv *hif_drv, struct rf_info *pstrSta return s32Error; } -s32 host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource, +int host_int_scan(struct host_if_drv *hif_drv, u8 u8ScanSource, u8 u8ScanType, u8 *pu8ChnlFreqList, u8 u8ChnlListLen, const u8 *pu8IEs, size_t IEsLen, wilc_scan_result ScanResult, void *pvUserArg, struct hidden_network *pstrHiddenNetwork) { - s32 s32Error = 0; + int s32Error = 0; struct host_if_msg msg; enum scan_conn_timer enuScanConnTimer; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 42458c9..7b229bb 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -833,7 +833,7 @@ int host_int_get_link_speed(struct host_if_drv *hWFIDrv, s8 *ps8lnkspd); * @date 8 March 2012 * @version 1.0 */ -s32 host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource, +int host_int_scan(struct host_if_drv *hWFIDrv, u8 u8ScanSource, u8 u8ScanType, u8 *pu8ChnlFreqList, u8 u8ChnlListLen, const u8 *pu8IEs, size_t IEsLen, wilc_scan_result ScanResult,