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

staging: unisys: Don't check for null before getting driver device.

Browse source 
The macro to convert to the driver object was giving a checkpatch warning
when it ateempted to check for a null driver. It would return NULL if it
found it, but only one location was checking to see if it was NULL.

Remove the check in the MACRO and do it prior to calling the macro if
required.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2017-08-30 13:36:17 -04:00 committed by Greg Kroah-Hartman
parent 9a8dc900ec
commit 68f4f7665c
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/unisys/include/visorbus.h
View file

@ -104,8 +104,7 @@ struct visor_driver {
struct device_driver driver;
};
#define to_visor_driver(x) ((x) ? \
(container_of(x, struct visor_driver, driver)) : (NULL))
#define to_visor_driver(x) (container_of(x, struct visor_driver, driver))
/**
* struct visor_device - A device type for things "plugged" into the visorbus

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

@ -1158,13 +1158,13 @@ static int visorchipset_initiate_device_pause_resume(struct visor_device *dev,
int err;
struct visor_driver *drv = NULL;
drv = to_visor_driver(dev->device.driver);
if (!drv)
return -ENODEV;
/* If no driver associated with the device nothing to pause/resume */
if (!dev->device.driver)
return 0;
if (dev->pausing || dev->resuming)
return -EBUSY;
drv = to_visor_driver(dev->device.driver);
if (is_pause) {
dev->pausing = true;
err = drv->pause(dev, pause_state_change_complete);