s390/ccwgroup: simplify ungrouping when driver deregisters

driver_unregister() ends up calling __device_release_driver() for
each device that is bound to the driver. Thus ccwgroup_notifier() will
see a BUS_NOTIFY_UNBIND_DRIVER event for these ccwgroup devices, and
trigger the ungrouping.

So there's no need to also trigger the ungrouping from within
ccwgroup_driver_unregister(), remove it.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 49f816c78873f9c3be23026fb97526ba39c38331..7e5ceea62731f092ac3e6eab33aa742828b44c95 100644 (file)
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -499,15 +499,6 @@ EXPORT_SYMBOL(ccwgroup_driver_register);
  */
 void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
 {
-       struct device *dev;
-
-       /* We don't want ccwgroup devices to live longer than their driver. */
-       while ((dev = driver_find_next_device(&cdriver->driver, NULL))) {
-               struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
-
-               ccwgroup_ungroup(gdev);
-               put_device(dev);
-       }
        driver_unregister(&cdriver->driver);
 }
 EXPORT_SYMBOL(ccwgroup_driver_unregister);