From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758230AbcFHVQA (ORCPT ); Wed, 8 Jun 2016 17:16:00 -0400 Received: from mail1.bemta8.messagelabs.com ([216.82.243.194]:35472 "EHLO mail1.bemta8.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161727AbcFHVOp (ORCPT ); Wed, 8 Jun 2016 17:14:45 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCIsWRWlGSWpSXmKPExsVywNY2U/dQV0S 4wZ3zzBYL25awWFzeNYfNgcnj8ya5AMYo1sy8pPyKBNaMhuuf2QteCFes2/uNpYHximAXIxeH kMAuRolLh54xQTj7GSVuL33CDOFcYpTYcv8fK4SzllFiw/q97BDOFkaJdz+XAvVwcrAJGEjMv HOXHcQWETjPIvH0Vi6IzSygJ7HtxBFmEFtYIFqid8YCsBoWARWJdX3H2boYOTh4BbwkVqzSAw lLCMhJnDw2mRXE5gQKP/y1Fmy8kICnRMu7x+wQtprE4bOP2CDqgyWannWB2bwCghInZz5hgVg rIXHwxQvmCYxCs5CkZiFJLWBkWsWoXpxaVJZapGuul1SUmZ5RkpuYmaNraGChl5taXJyYnpqT mFSsl5yfu4kRGMIMQLCD8cRk50OMkhxMSqK8Ze4R4UJ8SfkplRmJxRnxRaU5qcWHGGU4OJQke M90AuUEi1LTUyvSMnOA0QSTluDgURLh5QBGlBBvcUFibnFmOkTqFKMux6Hp19YyCbHk5eelSo nzioMUCYAUZZTmwY2ARfYlRlkpYV5GoKOEeApSi3IzS1DlXzGKczAqCfMuA7mEJzOvBG7TK6A jmICOWH4kHOSIkkSElFQDY8zxmXLJW8KnNymcsV8y+ZLRP645ggfPnv+0WuHn6T1vmooncW79 PtmvYNkGh28+9wQtNj4U4DL9E/RWf8o69s1/Hh776+pgLXfrRmSoC/udtBuf01ZIHvScmJRZN eHSRYevGkKP5v851zX5764VewSK2HnbzB7+urv6pv0Zhs0JFhfuXH5hZX5aiaU4I9FQi7moOB EAg9QpV+cCAAA= X-Env-Sender: David.Kershner@unisys.com X-Msg-Ref: server-5.tower-46.messagelabs.com!1465420478!29097732!15 X-Originating-IP: [192.61.61.105] X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked From: David Kershner To: , , , , , , , , , , , , , , , , , , , , , CC: Bryan Thompson Subject: [PATCH v4 12/29] staging: unisys: visorbus: Make visordriver_callback_lock a mutex Date: Wed, 8 Jun 2016 17:14:06 -0400 Message-ID: <1465420463-24982-13-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465420463-24982-1-git-send-email-david.kershner@unisys.com> References: <1465420463-24982-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 08 Jun 2016 21:14:28.0444 (UTC) FILETIME=[BDED11C0:01D1C1CA] MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bryan Thompson visordriver_callback_lock is just a binary semaphore that logically makes more sense as a mutex. Signed-off-by: Bryan Thompson Signed-off-by: David Kershner Reviewed-by: Tim Sell --- drivers/staging/unisys/include/visorbus.h | 2 +- drivers/staging/unisys/visorbus/visorbus_main.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h index 9bb88bb..3ba01cf 100644 --- a/drivers/staging/unisys/include/visorbus.h +++ b/drivers/staging/unisys/include/visorbus.h @@ -161,7 +161,7 @@ struct visor_device { struct timer_list timer; bool timer_active; 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 e98e720..2e0eb03 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -574,7 +574,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); @@ -584,7 +584,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; } @@ -600,11 +600,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); @@ -764,7 +764,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); -- 1.9.1