From patchwork Mon Jun 6 05:13:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 69364 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1311172qgf; Sun, 5 Jun 2016 22:14:26 -0700 (PDT) X-Received: by 10.98.56.141 with SMTP id f135mr22877176pfa.159.1465190065962; Sun, 05 Jun 2016 22:14:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i63si26032921pfa.231.2016.06.05.22.14.25; Sun, 05 Jun 2016 22:14:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbcFFFOR (ORCPT + 31 others); Mon, 6 Jun 2016 01:14:17 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:35465 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbcFFFOM (ORCPT ); Mon, 6 Jun 2016 01:14:12 -0400 Received: by mail-pa0-f43.google.com with SMTP id xk1so31814257pac.2 for ; Sun, 05 Jun 2016 22:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZDqzYXCbADKDPHVP+NCcabYlPzC+MFEwnF1XC896XqI=; b=Sn/2rU0iBE4p5epH+Zr1ronm+ZaeT/bEwQQMyQARioQZaz4AuWUf6xqIPAh5KxdAzG pvn6uojp8G1Hy1W8LEQ8ka3C4NLYdQDp8OcwCOVDhtw6732GCDzmAS+8FxmlguXSMy9e VJp/ryr3voeIx1DR6jxM3zdiiC/2veEhBqIl8= 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=ZDqzYXCbADKDPHVP+NCcabYlPzC+MFEwnF1XC896XqI=; b=SkzGiFrP85bu5SbKAVldKhqZBgsDo5MDEIgu17HRvBu2Huj/Mk1Jllac0YcOmtfqbV GAq911jqFHF9ZJk/I0xmz6yY/siKpWzzeRZP4ZbMvWgPo8ss1sSvW1dKjDsGINPREKSU puZNtVPnk5JHxwc0WjTXqUtc/FitCENF1X55btCahZFNevcqDiOBDK+HuWVctZVFjYfP 6kI2BlbfoOYyRNEP2eZTWvyrxPcyzS6evJP+qaQYLMR6bCbcwUbtQ62BTWFnVcuTs4Ch kT/nBafEy5YA7l8Hm9qcHZDh158kFVKbQhQkA9nedZWh1SfsxLcNLKQyJYO9G0hI5coe CpfA== X-Gm-Message-State: ALyK8tKiPxUkhGV85qhXZFVc44A1Ummp/a7UlivEfQHr1D2RcZ6IT5XNMhs7+knUtGvFjQQT X-Received: by 10.66.65.109 with SMTP id w13mr22351458pas.142.1465190051993; Sun, 05 Jun 2016 22:14:11 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id h5sm21457443pat.0.2016.06.05.22.14.09 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jun 2016 22:14:11 -0700 (PDT) From: Binoy Jayan To: Greg Kroah-Hartman , Larry Finger Cc: Jakub Sitnicki , Arnd Bergmann , driverdev-devel@linuxdriverproject.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH v3 1/4] staging: r8188eu: Replace semaphore cmd_queue_sema with completion Date: Mon, 6 Jun 2016 10:43:52 +0530 Message-Id: <1465190035-10359-2-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1465190035-10359-1-git-send-email-binoy.jayan@linaro.org> References: <1464947943-2008-1-git-send-email-binoy.jayan@linaro.org> <1465190035-10359-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'cmd_queue_sema' is used as completion, so convert it to struct completion. Signed-off-by: Binoy Jayan Reviewed-by: Arnd Bergmann Acked-by: Larry Finger --- drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +++--- drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c index 7748523..a2937e7 100644 --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c @@ -27,7 +27,7 @@ No irqsave is necessary. int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { - sema_init(&(pcmdpriv->cmd_queue_sema), 0); + init_completion(&pcmdpriv->cmd_queue_comp); sema_init(&(pcmdpriv->terminate_cmdthread_sema), 0); _rtw_init_queue(&(pcmdpriv->cmd_queue)); @@ -122,7 +122,7 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) res = _rtw_enqueue_cmd(&pcmdpriv->cmd_queue, cmd_obj); if (res == _SUCCESS) - up(&pcmdpriv->cmd_queue_sema); + complete(&pcmdpriv->cmd_queue_comp); exit: @@ -167,7 +167,7 @@ int rtw_cmd_thread(void *context) RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("start r871x rtw_cmd_thread !!!!\n")); while (1) { - if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL) + if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) break; if (padapter->bDriverStopped || diff --git a/drivers/staging/rtl8188eu/include/rtw_cmd.h b/drivers/staging/rtl8188eu/include/rtw_cmd.h index 08ca592..3532dd1 100644 --- a/drivers/staging/rtl8188eu/include/rtw_cmd.h +++ b/drivers/staging/rtl8188eu/include/rtw_cmd.h @@ -39,7 +39,7 @@ struct cmd_obj { }; struct cmd_priv { - struct semaphore cmd_queue_sema; + struct completion cmd_queue_comp; struct semaphore terminate_cmdthread_sema; struct __queue cmd_queue; u8 cmdthd_running; diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c index ae2caff..a696d2b 100644 --- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c +++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c @@ -772,7 +772,7 @@ void rtw_stop_drv_threads(struct adapter *padapter) RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n")); /* Below is to terminate rtw_cmd_thread & event_thread... */ - up(&padapter->cmdpriv.cmd_queue_sema); + complete(&padapter->cmdpriv.cmd_queue_comp); if (padapter->cmdThread) _rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);