mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 10:57:46 +00:00
Code Issues Releases Wiki Activity

staging: unisys: visorinput: make lock_visor_dev a mutex

Browse source 
Since lock_visor_dev is a binary semaphore it makes more sense to
use a mutex lock.

Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Acked-By: Neil Horman <nhorman@tuxdriver.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tim Sell 2016-06-10 21:48:26 -04:00 committed by Greg Kroah-Hartman
parent 24ce1b6661
commit 8dfb8fdbd2
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/unisys/visorinput/visorinput.c
View file

@ -63,7 +63,7 @@ enum visorinput_device_type {
*/ */
struct visorinput_devdata { struct visorinput_devdata {
struct visor_device *dev; struct visor_device *dev;
struct rw_semaphore lock_visor_dev; /* lock for dev */ struct mutex lock_visor_dev; /* lock for dev */
struct input_dev *visorinput_dev; struct input_dev *visorinput_dev;
bool paused; bool paused;
bool interrupts_enabled; bool interrupts_enabled;
@ -236,14 +236,14 @@ static int visorinput_open(struct input_dev *visorinput_dev)
* interrupts should be enabled so when we resume, interrupts * interrupts should be enabled so when we resume, interrupts
* will really be enabled. * will really be enabled.
*/ */
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
devdata->interrupts_enabled = true; devdata->interrupts_enabled = true;
if (devdata->paused) if (devdata->paused)
goto out_unlock; goto out_unlock;
visorbus_enable_channel_interrupts(devdata->dev); visorbus_enable_channel_interrupts(devdata->dev);
out_unlock: out_unlock:
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
return 0; return 0;
} }
@ -266,14 +266,14 @@ static void visorinput_close(struct input_dev *visorinput_dev)
* not re-enable them. * not re-enable them.
*/ */
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
devdata->interrupts_enabled = false; devdata->interrupts_enabled = false;
if (devdata->paused) if (devdata->paused)
goto out_unlock; goto out_unlock;
visorbus_disable_channel_interrupts(devdata->dev); visorbus_disable_channel_interrupts(devdata->dev);
out_unlock: out_unlock:
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
} }
/* /*
@ -377,8 +377,8 @@ devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
devdata = kzalloc(sizeof(*devdata) + extra_bytes, GFP_KERNEL); devdata = kzalloc(sizeof(*devdata) + extra_bytes, GFP_KERNEL);
if (!devdata) if (!devdata)
return NULL; return NULL;
init_rwsem(&devdata->lock_visor_dev); mutex_init(&devdata->lock_visor_dev);
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
devdata->dev = dev; devdata->dev = dev;
/* /*
@ -414,7 +414,7 @@ devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
} }
dev_set_drvdata(&dev->device, devdata); dev_set_drvdata(&dev->device, devdata);
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
/* /*
* Device struct is completely set up now, with the exception of * Device struct is completely set up now, with the exception of
@ -428,7 +428,7 @@ devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
goto err_kfree_devdata; goto err_kfree_devdata;
} }
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
/* /*
* Establish calls to visorinput_channel_interrupt() if that is * Establish calls to visorinput_channel_interrupt() if that is
* the desired state that we've kept track of in interrupts_enabled * the desired state that we've kept track of in interrupts_enabled
@ -437,12 +437,12 @@ devdata_create(struct visor_device *dev, enum visorinput_device_type devtype)
devdata->paused = false; devdata->paused = false;
if (devdata->interrupts_enabled) if (devdata->interrupts_enabled)
visorbus_enable_channel_interrupts(dev); visorbus_enable_channel_interrupts(dev);
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
return devdata; return devdata;
cleanups_register: cleanups_register:
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
err_kfree_devdata: err_kfree_devdata:
kfree(devdata); kfree(devdata);
return NULL; return NULL;
@ -482,7 +482,7 @@ visorinput_remove(struct visor_device *dev)
if (!devdata) if (!devdata)
return; return;
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
visorbus_disable_channel_interrupts(dev); visorbus_disable_channel_interrupts(dev);
/* /*
@ -491,7 +491,7 @@ visorinput_remove(struct visor_device *dev)
*/ */
dev_set_drvdata(&dev->device, NULL); dev_set_drvdata(&dev->device, NULL);
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
unregister_client_input(devdata->visorinput_dev); unregister_client_input(devdata->visorinput_dev);
kfree(devdata); kfree(devdata);
@ -671,7 +671,7 @@ visorinput_pause(struct visor_device *dev,
goto out; goto out;
} }
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
if (devdata->paused) { if (devdata->paused) {
rc = -EBUSY; rc = -EBUSY;
goto out_locked; goto out_locked;
@ -688,7 +688,7 @@ visorinput_pause(struct visor_device *dev,
complete_func(dev, 0); complete_func(dev, 0);
rc = 0; rc = 0;
out_locked: out_locked:
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
out: out:
return rc; return rc;
} }
@ -704,7 +704,7 @@ visorinput_resume(struct visor_device *dev,
rc = -ENODEV; rc = -ENODEV;
goto out; goto out;
} }
down_write(&devdata->lock_visor_dev); mutex_lock(&devdata->lock_visor_dev);
if (!devdata->paused) { if (!devdata->paused) {
rc = -EBUSY; rc = -EBUSY;
goto out_locked; goto out_locked;
@ -722,7 +722,7 @@ visorinput_resume(struct visor_device *dev,
rc = 0; rc = 0;
out_locked: out_locked:
up_write(&devdata->lock_visor_dev); mutex_unlock(&devdata->lock_visor_dev);
out: out:
return rc; return rc;
} }