From patchwork Thu Jan 21 01:20:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaehyun Lim X-Patchwork-Id: 8076431 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 EDA2E9F859 for ; Thu, 21 Jan 2016 01:21:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BEAE20531 for ; Thu, 21 Jan 2016 01:21:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D42C20527 for ; Thu, 21 Jan 2016 01:21:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754952AbcAUBVm (ORCPT ); Wed, 20 Jan 2016 20:21:42 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35471 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752511AbcAUBVk (ORCPT ); Wed, 20 Jan 2016 20:21:40 -0500 Received: by mail-pf0-f195.google.com with SMTP id 65so1055590pff.2 for ; Wed, 20 Jan 2016 17:21:40 -0800 (PST) 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=N+jZfpuvLfEvWsEdqF3eczfa5SKb8webpinXo1SyzNo=; b=hp6wGbNY+PfYeB4YKxXWbNeoLwQCBrhrDpZH534cKyVg3qpa3+BgH1511Mzt0SXFoB 8uVjHzlGxZ+3iLY9qoCNNTRkmFTtJ2G2qkx4R6a74xGNUyeenzlKQybH3kwAOCmi062m v2bMQOD2e0VVcfd9uAYktmBjlp6WnsLbA0LoQum1asCOki8i6I+GZanMVP7slNZI009V Kq+ElEYIt8Z8JIcxN/0uVJAfJi6cwNzChOlv3pR4OWnBYmZjZui1y0KFxCuV+PEt3Aqn nhshA91Ch5aTziK8g/Yqd5CQnM4CqagoaUWGUorvE6zcDx/gBYRbYf33SyAW4jdmTICu WMlg== 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=N+jZfpuvLfEvWsEdqF3eczfa5SKb8webpinXo1SyzNo=; b=XZ8PgWWF6+gaUMZ2wFnRJze8MdfNypqMAIRyQfOw+rRufkye/ejsF3Fqzz3A0VrcTX 8+3befM/XIzwzr285OajVs+sI23Nnz+j/m9f+DMqk+0oV1w/AEaEoCMt9XrrL6ppNm3X /KqpmuuSPa02NyUQONKQ6Fju3ONwcic3NBh2X9K1ld+AJC82r213R9cKwUc7qR3+Z+Ph sZ7Bn+ICD2UNpYPv5HM5lxQo2gLfq/vevpUgmy6P/XhW0wpg33sMQg7w+9vqFk8TIvJG nLlKUKhbQULfaGa9BSi/GH4Y3MrQwSK9wMW3fF+qenSy+naAm/mWcMi2h/bVpBJhDpWR Jd1w== X-Gm-Message-State: ALoCoQmv2Cdj+Z5OukpYLnxeb2ZE1PT0x3Vy9CyfLdmw+YMB20CVaJFzxD9V5zgmpkfvErNwRbsCG6Aprwqpq1jN6PWzvd6NNQ== X-Received: by 10.98.75.4 with SMTP id y4mr56822352pfa.32.1453339300039; Wed, 20 Jan 2016 17:21:40 -0800 (PST) Received: from localhost.localdomain ([218.233.16.2]) by smtp.gmail.com with ESMTPSA id s19sm51372596pfs.62.2016.01.20.17.21.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 17:21:39 -0800 (PST) From: Chaehyun Lim To: gregkh@linuxfoundation.org Cc: johnny.kim@atmel.com, austin.shin@atmel.com, chris.park@atmel.com, tony.cho@atmel.com, glen.lee@atmel.com, leo.kim@atmel.com, linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, Chaehyun Lim Subject: [PATCH 20/27] staging: wilc1000: rename pHandle in wilc_mq_recv Date: Thu, 21 Jan 2016 10:20:23 +0900 Message-Id: <1453339230-1377-20-git-send-email-chaehyun.lim@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453339230-1377-1-git-send-email-chaehyun.lim@gmail.com> References: <1453339230-1377-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, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 renames pHandle to mq to avoid camelcase. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/wilc_msgqueue.c | 34 ++++++++++++++++---------------- drivers/staging/wilc1000/wilc_msgqueue.h | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c index 361ca8f..d2df179 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.c +++ b/drivers/staging/wilc1000/wilc_msgqueue.c @@ -109,56 +109,56 @@ int wilc_mq_send(struct message_queue *mq, * @note copied from FLO glue implementatuion * @version 1.0 */ -int wilc_mq_recv(struct message_queue *pHandle, +int wilc_mq_recv(struct message_queue *mq, void *pvRecvBuffer, u32 u32RecvBufferSize, u32 *pu32ReceivedLength) { struct message *pstrMessage; unsigned long flags; - if ((!pHandle) || (u32RecvBufferSize == 0) + if ((!mq) || (u32RecvBufferSize == 0) || (!pvRecvBuffer) || (!pu32ReceivedLength)) { - PRINT_ER("pHandle or pvRecvBuffer is null\n"); + PRINT_ER("mq or pvRecvBuffer is null\n"); return -EINVAL; } - if (pHandle->exiting) { - PRINT_ER("pHandle fail\n"); + if (mq->exiting) { + PRINT_ER("mq fail\n"); return -EFAULT; } - spin_lock_irqsave(&pHandle->lock, flags); - pHandle->recv_count++; - spin_unlock_irqrestore(&pHandle->lock, flags); + spin_lock_irqsave(&mq->lock, flags); + mq->recv_count++; + spin_unlock_irqrestore(&mq->lock, flags); - down(&pHandle->sem); - spin_lock_irqsave(&pHandle->lock, flags); + down(&mq->sem); + spin_lock_irqsave(&mq->lock, flags); - pstrMessage = pHandle->msg_list; + pstrMessage = mq->msg_list; if (!pstrMessage) { - spin_unlock_irqrestore(&pHandle->lock, flags); + spin_unlock_irqrestore(&mq->lock, flags); PRINT_ER("pstrMessage is null\n"); return -EFAULT; } /* check buffer size */ if (u32RecvBufferSize < pstrMessage->len) { - spin_unlock_irqrestore(&pHandle->lock, flags); - up(&pHandle->sem); + spin_unlock_irqrestore(&mq->lock, flags); + up(&mq->sem); PRINT_ER("u32RecvBufferSize overflow\n"); return -EOVERFLOW; } /* consume the message */ - pHandle->recv_count--; + mq->recv_count--; memcpy(pvRecvBuffer, pstrMessage->buf, pstrMessage->len); *pu32ReceivedLength = pstrMessage->len; - pHandle->msg_list = pstrMessage->next; + mq->msg_list = pstrMessage->next; kfree(pstrMessage->buf); kfree(pstrMessage); - spin_unlock_irqrestore(&pHandle->lock, flags); + spin_unlock_irqrestore(&mq->lock, flags); return 0; } diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h index 70e1be1..0c1eead 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.h +++ b/drivers/staging/wilc1000/wilc_msgqueue.h @@ -76,7 +76,7 @@ int wilc_mq_send(struct message_queue *mq, * @date 30 Aug 2010 * @version 1.0 */ -int wilc_mq_recv(struct message_queue *pHandle, +int wilc_mq_recv(struct message_queue *mq, void *pvRecvBuffer, u32 u32RecvBufferSize, u32 *pu32ReceivedLength);