diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-09-13 10:59:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 20:06:02 +0200 |
| commit | d4372179c85b50cf0a468c1d573113056b0c46a0 (patch) | |
| tree | 229bfb4c12822b2cce175fc7730ac343bbc6806f /drivers/staging/hv/vmbus_drv.c | |
| parent | ab101e86d0f2c00c11aec5b16e27246ccecb0870 (diff) | |
Staging: hv: vmbus: Cleanup vmbus_remove()
vmbus_remove() cannot fail; clean it up accordingly.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/vmbus_drv.c')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 2fccb1f974c0..466425a5ed3f 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -334,22 +334,14 @@ static int vmbus_probe(struct device *child_device) */ static int vmbus_remove(struct device *child_device) { - int ret; - struct hv_driver *drv; - + struct hv_driver *drv = drv_to_hv_drv(child_device->driver); struct hv_device *dev = device_to_hv_device(child_device); - if (child_device->driver) { - drv = drv_to_hv_drv(child_device->driver); - - if (drv->remove) { - ret = drv->remove(dev); - } else { - pr_err("remove not set for driver %s\n", - dev_name(child_device)); - ret = -ENODEV; - } - } + if (drv->remove) + drv->remove(dev); + else + pr_err("remove not set for driver %s\n", + dev_name(child_device)); return 0; } |