From patchwork Thu Oct 15 02:06:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 7400571 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 80AB89F302 for ; Thu, 15 Oct 2015 02:12:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9BC8206F2 for ; Thu, 15 Oct 2015 02:12:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B973E206BC for ; Thu, 15 Oct 2015 02:12:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754977AbbJOCMw (ORCPT ); Wed, 14 Oct 2015 22:12:52 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33923 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932771AbbJOCIU (ORCPT ); Wed, 14 Oct 2015 22:08:20 -0400 Received: by payp3 with SMTP id p3so23401350pay.1 for ; Wed, 14 Oct 2015 19:08:20 -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=R6AxZWQec8VCPzdOM9+luNDc+h9py0Eg6qFLPMXQ8Dw=; b=H/ldv69x/q5rt559tAGlBcrsJHycHfl+IVw5LyUEYbJxuxh7UgNd+//1NU4D3evheG 4k/V5n+0RMKT+8JdX8jR8cAxZrqafw6/BgepYqEr1jpav91Gb7Un9uOTUCKbvSczSyh7 ILU9Ika12BhWkO+1HpfRUCGkq43W5fNkSQ+BDc1FFKoROzRhc2SS12Rlj5ORTghEx1p/ AS1k0+yUSA3t6kIUutx8DfpSufpu04E3g56kRU/8yy6Mvy7uCgnAiiNiMzHDJH3oviC5 0ul5Zucxm2H4LenBhuDlIhtRm9nVHtjdGgy8SPmxT4R8l4YKVPtPS25A8P0PY7rjKcga 4HYw== X-Received: by 10.68.109.2 with SMTP id ho2mr7231826pbb.158.1444874900066; Wed, 14 Oct 2015 19:08:20 -0700 (PDT) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id nv2sm11997253pbc.48.2015.10.14.19.08.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Oct 2015 19:08:19 -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 25/33] staging: wilc1000: fix return type of host_int_set_power_mgmt Date: Thu, 15 Oct 2015 11:06:54 +0900 Message-Id: <1444874822-31152-25-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_set_power_mgmt 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 9cb6d7f..20d6e16 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4848,11 +4848,11 @@ s32 host_int_edit_station(struct host_if_drv *hif_drv, return s32Error; } -s32 host_int_set_power_mgmt(struct host_if_drv *hif_drv, +int host_int_set_power_mgmt(struct host_if_drv *hif_drv, bool bIsEnabled, u32 u32Timeout) { - s32 s32Error = 0; + int s32Error = 0; struct host_if_msg msg; struct power_mgmt_param *pstrPowerMgmtParam = &msg.body.pwr_mgmt_info; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 6e8f533..bed3799 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -1046,7 +1046,7 @@ s32 host_int_edit_station(struct host_if_drv *hWFIDrv, * @date 24 November 2012 * @version 1.0 Description */ -s32 host_int_set_power_mgmt(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32Timeout); +int host_int_set_power_mgmt(struct host_if_drv *hWFIDrv, bool bIsEnabled, u32 u32Timeout); /* @param[in,out] hWFIDrv handle to the wifi driver * @param[in] bIsEnabled TRUE if enabled, FALSE otherwise * @param[in] u8count count of mac address entries in the filter table