Commit a0016408 authored by Cornelia Huck's avatar Cornelia Huck Committed by Linus Torvalds

[PATCH] s390: ccwgroup online attribute

Make the interface for setting ccw group devices on-/offline consistent with
that for ccw devices: Check if the device driver provided a set_{on,off}line
function and just set the device on-/offline if not.
Signed-off-by: default avatarCornelia Huck <cohuck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9b4554aa
/* /*
* drivers/s390/cio/ccwgroup.c * drivers/s390/cio/ccwgroup.c
* bus driver for ccwgroup * bus driver for ccwgroup
* $Revision: 1.29 $ * $Revision: 1.32 $
* *
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation * IBM Corporation
...@@ -274,7 +274,7 @@ ccwgroup_set_online(struct ccwgroup_device *gdev) ...@@ -274,7 +274,7 @@ ccwgroup_set_online(struct ccwgroup_device *gdev)
goto out; goto out;
} }
gdrv = to_ccwgroupdrv (gdev->dev.driver); gdrv = to_ccwgroupdrv (gdev->dev.driver);
if ((ret = gdrv->set_online(gdev))) if ((ret = gdrv->set_online ? gdrv->set_online(gdev) : 0))
goto out; goto out;
gdev->state = CCWGROUP_ONLINE; gdev->state = CCWGROUP_ONLINE;
...@@ -300,7 +300,7 @@ ccwgroup_set_offline(struct ccwgroup_device *gdev) ...@@ -300,7 +300,7 @@ ccwgroup_set_offline(struct ccwgroup_device *gdev)
goto out; goto out;
} }
gdrv = to_ccwgroupdrv (gdev->dev.driver); gdrv = to_ccwgroupdrv (gdev->dev.driver);
if ((ret = gdrv->set_offline(gdev))) if ((ret = gdrv->set_offline ? gdrv->set_offline(gdev) : 0))
goto out; goto out;
gdev->state = CCWGROUP_OFFLINE; gdev->state = CCWGROUP_OFFLINE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment