From patchwork Mon Jun 20 05:06:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 70405 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1342160qgy; Sun, 19 Jun 2016 22:15:35 -0700 (PDT) X-Received: by 10.66.120.138 with SMTP id lc10mr19577236pab.33.1466399735109; Sun, 19 Jun 2016 22:15:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r88si30985516pfa.128.2016.06.19.22.15.34; Sun, 19 Jun 2016 22:15:35 -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 S1752370AbcFTFPa (ORCPT + 30 others); Mon, 20 Jun 2016 01:15:30 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35655 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbcFTFPT (ORCPT ); Mon, 20 Jun 2016 01:15:19 -0400 Received: by mail-pf0-f178.google.com with SMTP id c2so50322715pfa.2 for ; Sun, 19 Jun 2016 22:15:18 -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; bh=pr1tu7jiU0z8XcWjEmEp9Q/YHQSHC1avjvqJ8+dX2P0=; b=cxtuE3gTre/0jC2rboIyCkmWH6AOQscwqsEqZmQ2Q0ptXrbeAXIb1gGOwfbCdFChib V2F30cEifcPGh0r9/DClb/kbJ4hhYDmyoc3tQ0uA1DAqfUExuwlanpG3lmBFgYsAJOE4 12NWHmQrGXq901GDlNMBOt26LmKh1iRfoCwNI= 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; bh=pr1tu7jiU0z8XcWjEmEp9Q/YHQSHC1avjvqJ8+dX2P0=; b=ChCNAzywtzn5aSp/WjG9RAQfVQQZUObBNEtuAZnq0xbAz8QpK1cotZVSiX27WO252W fPjRlvDqhsUjjWsliPd+Nua9tx5QGwdJl3mNvtiisyop6Q1HB8HLES0cmRk/VzZODRB/ LaNE6CHLa3l8jxsiNj7u1COy3ROqb2Fw5Obwn8AkUA23ufYpVtXhbLHUtRL3tTuX1QvZ OfZE08FelWNrMFmmXF6Ly0ucvYIucQRIHy7Vkov/Fs7HO7caF1NPMNILpSmY1HbIoek5 R57OvBk2YhOsdPUGpgX0zQMkcpGMTwcjLO9Dicx7DR24n8kglGIfEmNkFQT6drCkYk4G 0a6w== X-Gm-Message-State: ALyK8tJ00NLTmwmfRyYjR3XzIJnOsCLUTzE1J/AelKmoGACERa5AA2iP0n8lvKY5d9h7Fze3 X-Received: by 10.98.85.5 with SMTP id j5mr14668237pfb.81.1466399226908; Sun, 19 Jun 2016 22:07:06 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id f10sm47124544pfc.79.2016.06.19.22.07.03 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 22:07:06 -0700 (PDT) From: Binoy Jayan To: David Kershner , Greg Kroah-Hartman Cc: Arnd Bergmann , sparmaintainer@unisys.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH] staging: unisys: visorbus: Replace semaphore with mutex Date: Mon, 20 Jun 2016 10:36:42 +0530 Message-Id: <1466399202-20821-1-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The semaphore 'visordriver_callback_lock' is a simple mutex, so it should be written as one. Semaphores are going away in the future. Signed-off-by: Binoy Jayan --- drivers/staging/unisys/include/visorbus.h | 3 ++- drivers/staging/unisys/visorbus/visorbus_main.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h index 9baf1ec..38edca8 100644 --- a/drivers/staging/unisys/include/visorbus.h +++ b/drivers/staging/unisys/include/visorbus.h @@ -34,6 +34,7 @@ #include #include #include +#include #include "periodic_work.h" #include "channel.h" @@ -159,7 +160,7 @@ struct visor_device { struct list_head list_all; struct periodic_work *periodic_work; bool being_removed; - struct semaphore visordriver_callback_lock; + struct mutex visordriver_callback_lock; bool pausing; bool resuming; u32 chipset_bus_no; diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c index 3a147db..93996a5 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -544,10 +544,10 @@ dev_periodic_work(void *xdev) struct visor_device *dev = xdev; struct visor_driver *drv = to_visor_driver(dev->device.driver); - down(&dev->visordriver_callback_lock); + mutex_lock(&dev->visordriver_callback_lock); if (drv->channel_interrupt) drv->channel_interrupt(dev); - up(&dev->visordriver_callback_lock); + mutex_unlock(&dev->visordriver_callback_lock); if (!visor_periodic_work_nextperiod(dev->periodic_work)) put_device(&dev->device); } @@ -588,7 +588,7 @@ visordriver_probe_device(struct device *xdev) if (!drv->probe) return -ENODEV; - down(&dev->visordriver_callback_lock); + mutex_lock(&dev->visordriver_callback_lock); dev->being_removed = false; res = drv->probe(dev); @@ -598,7 +598,7 @@ visordriver_probe_device(struct device *xdev) fix_vbus_dev_info(dev); } - up(&dev->visordriver_callback_lock); + mutex_unlock(&dev->visordriver_callback_lock); return res; } @@ -614,11 +614,11 @@ visordriver_remove_device(struct device *xdev) dev = to_visor_device(xdev); drv = to_visor_driver(xdev->driver); - down(&dev->visordriver_callback_lock); + mutex_lock(&dev->visordriver_callback_lock); dev->being_removed = true; if (drv->remove) drv->remove(dev); - up(&dev->visordriver_callback_lock); + mutex_unlock(&dev->visordriver_callback_lock); dev_stop_periodic_work(dev); put_device(&dev->device); @@ -778,7 +778,7 @@ create_visor_device(struct visor_device *dev) POSTCODE_LINUX_4(DEVICE_CREATE_ENTRY_PC, chipset_dev_no, chipset_bus_no, POSTCODE_SEVERITY_INFO); - sema_init(&dev->visordriver_callback_lock, 1); /* unlocked */ + mutex_init(&dev->visordriver_callback_lock); dev->device.bus = &visorbus_type; dev->device.groups = visorbus_channel_groups; device_initialize(&dev->device);