From 457dc357ca5adaa6c01b7078de931b7e1204097f Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 13 Sep 2011 10:59:44 -0700 Subject: [PATCH] --- yaml --- r: 268371 b: refs/heads/master c: d4372179c85b50cf0a468c1d573113056b0c46a0 h: refs/heads/master i: 268369: 131ef18c7ab5a9f43a55d7cf090251b2e4fc8932 268367: 898f0852b97e3927ce764dbca5535fba344dddb8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index f4ecf9daa696..137a78f6f16e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab101e86d0f2c00c11aec5b16e27246ccecb0870 +refs/heads/master: d4372179c85b50cf0a468c1d573113056b0c46a0 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 2fccb1f974c0..466425a5ed3f 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/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; }