Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fa73eb4738fc75317a481aa95cd472d0d6d057c3

Authored by Sebastian Ott
Committed by Martin Schwidefsky
1 parent 0310c8b582
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

s390/ccwgroup: use ccwgroup_ungroup wrapper 

To ungroup and deregister the group device always use the
ccwgroup_ungroup wrapper.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 1 changed file with 2 additions and 12 deletions Side-by-side Diff

drivers/s390/cio/ccwgroup.c
Diff comments   View file @ fa73eb4
... ... @@ -586,11 +586,7 @@
586 586 __ccwgroup_match_all))) {
587 587 struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
588 588  
589   - mutex_lock(&gdev->reg_mutex);
590   - __ccwgroup_remove_symlinks(gdev);
591   - device_unregister(dev);
592   - __ccwgroup_remove_cdev_refs(gdev);
593   - mutex_unlock(&gdev->reg_mutex);
  589 + ccwgroup_ungroup(gdev);
594 590 put_device(dev);
595 591 }
596 592 driver_unregister(&cdriver->driver);
... ... @@ -637,13 +633,7 @@
637 633 get_device(&gdev->dev);
638 634 spin_unlock_irq(cdev->ccwlock);
639 635 /* Unregister group device. */
640   - mutex_lock(&gdev->reg_mutex);
641   - if (device_is_registered(&gdev->dev)) {
642   - __ccwgroup_remove_symlinks(gdev);
643   - device_unregister(&gdev->dev);
644   - __ccwgroup_remove_cdev_refs(gdev);
645   - }
646   - mutex_unlock(&gdev->reg_mutex);
  636 + ccwgroup_ungroup(gdev);
647 637 /* Release ccwgroup device reference for local processing. */
648 638 put_device(&gdev->dev);
649 639 }