From patchwork Mon Oct 17 16:30:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 77771 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp476780qge; Mon, 17 Oct 2016 09:32:20 -0700 (PDT) X-Received: by 10.98.157.218 with SMTP id a87mr39161464pfk.1.1476721940303; Mon, 17 Oct 2016 09:32:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s8si26322779pab.60.2016.10.17.09.32.18; Mon, 17 Oct 2016 09:32:20 -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 S936119AbcJQQcJ (ORCPT + 27 others); Mon, 17 Oct 2016 12:32:09 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:35029 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935983AbcJQQbt (ORCPT ); Mon, 17 Oct 2016 12:31:49 -0400 Received: by mail-pf0-f181.google.com with SMTP id s8so81115510pfj.2 for ; Mon, 17 Oct 2016 09:31:42 -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=Jeu6Jnqyl08TQPobweVY36uuvACe4t8cliSLt1dX6Is=; b=GR548SuvNM1mt0OVLS2jlz4L+IeiU+RPL/VR/6MNRv5TmIIn0W/CHdMWeIEZquQnrS MRSwwrUGVtwGM0wpkiSJ48HNxQGNFko0iNRzffLfYFndLhtM03JL/RWPripo369nZR9d BtyRaY3dIquNyoUw9u6eeApT8P98kENqU8wPI= 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=Jeu6Jnqyl08TQPobweVY36uuvACe4t8cliSLt1dX6Is=; b=hqA/+plC6B0Y4CmGyXBw1xES0kUePDjqj7jT10Jrh3bwaVrAEOrSbB1o5tNDXWl1bL XJM9j4LJsE7Rh1qFvILWhMPQ6vb5TgMgPhHZ6EqEM8pWWQsh78A+9fy7p0fNrkeEt30F OHpXdQurysbX/F7NoNtVlCDSp+zmYP9q2IVmjXYagwq5dIuqtM+RSWxGRYdRfZqMTBgm ZiXnerC/cVoB0wUKNbfsBbX2R3ar32zb3UqL3P5JSF+zPt8KnYBnTdT23/3Tsbjq0ffZ D6jMJvJTVl2aMNRieEsnVTmUIt/jsGDIr7llqVLPYdPp56HiQmG0uvs/avAusFc4Dh3g uweQ== X-Gm-Message-State: AA6/9RkJIoRSOzlyXAuEwu2TnqmSUikNXFL3lMYRULf0uOBZQrQS/4zjaR6zqP9yc2UI7BhN X-Received: by 10.99.153.17 with SMTP id d17mr32387824pge.122.1476721902029; Mon, 17 Oct 2016 09:31:42 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id o9sm43009638pac.27.2016.10.17.09.31.39 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Oct 2016 09:31:41 -0700 (PDT) From: Binoy Jayan To: Doug Ledford , Sean Hefty , Hal Rosenstock Cc: Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH 2/8] IB/core: Replace semaphore sm_sem with completion Date: Mon, 17 Oct 2016 22:00:56 +0530 Message-Id: <1476721862-7070-3-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1476721862-7070-1-git-send-email-binoy.jayan@linaro.org> References: <1476721862-7070-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 'sm_sem' is used as completion, so convert it to struct completion. Semaphores are going away in the future. The initial status of the completion variable is marked as completed by a call to the function 'complete' immediately following the initialization. Signed-off-by: Binoy Jayan --- drivers/infiniband/core/user_mad.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 415a318..df070cc 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -87,7 +88,7 @@ struct ib_umad_port { struct cdev sm_cdev; struct device *sm_dev; - struct semaphore sm_sem; + struct completion sm_comp; struct mutex file_mutex; struct list_head file_list; @@ -1030,12 +1031,12 @@ static int ib_umad_sm_open(struct inode *inode, struct file *filp) port = container_of(inode->i_cdev, struct ib_umad_port, sm_cdev); if (filp->f_flags & O_NONBLOCK) { - if (down_trylock(&port->sm_sem)) { + if (!try_wait_for_completion(&port->sm_comp)) { ret = -EAGAIN; goto fail; } } else { - if (down_interruptible(&port->sm_sem)) { + if (wait_for_completion_interruptible(&port->sm_comp)) { ret = -ERESTARTSYS; goto fail; } @@ -1060,7 +1061,7 @@ static int ib_umad_sm_open(struct inode *inode, struct file *filp) ib_modify_port(port->ib_dev, port->port_num, 0, &props); err_up_sem: - up(&port->sm_sem); + complete(&port->sm_comp); fail: return ret; @@ -1079,7 +1080,7 @@ static int ib_umad_sm_close(struct inode *inode, struct file *filp) ret = ib_modify_port(port->ib_dev, port->port_num, 0, &props); mutex_unlock(&port->file_mutex); - up(&port->sm_sem); + complete(&port->sm_comp); kobject_put(&port->umad_dev->kobj); @@ -1177,7 +1178,8 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, port->ib_dev = device; port->port_num = port_num; - sema_init(&port->sm_sem, 1); + init_completion(&port->sm_comp); + complete(&port->sm_comp); mutex_init(&port->file_mutex); INIT_LIST_HEAD(&port->file_list);