redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: unisys: visorbus: Fix up visordriver_probe

Browse source 
Fixup the visordriver_probe function. Rearrange the function to avoid
needing gotos and removed unnecessary wmb().

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-03-12 21:27:08 -05:00 committed by Greg Kroah-Hartman
parent c6af7a9cbc
commit 4000622ec2
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/staging/unisys/visorbus/visorbus_main.c
View file

@ -752,36 +752,28 @@ dev_stop_periodic_work(struct visor_device *dev)
static int
visordriver_probe_device(struct device *xdev)
{
int rc;
int res;
struct visor_driver *drv;
struct visor_device *dev;
drv = to_visor_driver(xdev->driver);
dev = to_visor_device(xdev);
if (!drv->probe)
return -ENODEV;
down(&dev->visordriver_callback_lock);
dev->being_removed = false;
/*
* ensure that the dev->being_removed flag is cleared before
* we start the probe
*/
wmb();
get_device(&dev->device);
if (!drv->probe) {
up(&dev->visordriver_callback_lock);
rc = -ENODEV;
goto away;
}
rc = drv->probe(dev);
if (rc < 0)
goto away;
fix_vbus_dev_info(dev);
res = drv->probe(dev);
if (res >= 0) {
/* success: reference kept via unmatched get_device() */
get_device(&dev->device);
fix_vbus_dev_info(dev);
}
up(&dev->visordriver_callback_lock);
rc = 0;
away:
if (rc != 0)
put_device(&dev->device);
return rc;
return res;
}
/** This is called when device_unregister() is called for each child device