提交 4d7a3cdf 编写于 作者: F Frank Munzert 提交者: Martin Schwidefsky

[S390] Use tape_generic_offline directly.

tape_3590_offline and tape_34xx_offline are removed and tape_generic_offline
is called directly instead.
Signed-off-by: NFrank Munzert <munzert@de.ibm.com>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
上级 e1c80530
...@@ -285,7 +285,7 @@ extern int tape_mtop(struct tape_device *, int, int); ...@@ -285,7 +285,7 @@ extern int tape_mtop(struct tape_device *, int, int);
extern void tape_state_set(struct tape_device *, enum tape_state); extern void tape_state_set(struct tape_device *, enum tape_state);
extern int tape_generic_online(struct tape_device *, struct tape_discipline *); extern int tape_generic_online(struct tape_device *, struct tape_discipline *);
extern int tape_generic_offline(struct tape_device *device); extern int tape_generic_offline(struct ccw_device *);
/* Externals from tape_devmap.c */ /* Externals from tape_devmap.c */
extern int tape_generic_probe(struct ccw_device *); extern int tape_generic_probe(struct ccw_device *);
......
...@@ -1294,12 +1294,6 @@ tape_34xx_online(struct ccw_device *cdev) ...@@ -1294,12 +1294,6 @@ tape_34xx_online(struct ccw_device *cdev)
); );
} }
static int
tape_34xx_offline(struct ccw_device *cdev)
{
return tape_generic_offline(cdev->dev.driver_data);
}
static struct ccw_driver tape_34xx_driver = { static struct ccw_driver tape_34xx_driver = {
.name = "tape_34xx", .name = "tape_34xx",
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -1307,7 +1301,7 @@ static struct ccw_driver tape_34xx_driver = { ...@@ -1307,7 +1301,7 @@ static struct ccw_driver tape_34xx_driver = {
.probe = tape_generic_probe, .probe = tape_generic_probe,
.remove = tape_generic_remove, .remove = tape_generic_remove,
.set_online = tape_34xx_online, .set_online = tape_34xx_online,
.set_offline = tape_34xx_offline, .set_offline = tape_generic_offline,
}; };
static int static int
......
...@@ -1707,19 +1707,13 @@ tape_3590_online(struct ccw_device *cdev) ...@@ -1707,19 +1707,13 @@ tape_3590_online(struct ccw_device *cdev)
&tape_discipline_3590); &tape_discipline_3590);
} }
static int
tape_3590_offline(struct ccw_device *cdev)
{
return tape_generic_offline(cdev->dev.driver_data);
}
static struct ccw_driver tape_3590_driver = { static struct ccw_driver tape_3590_driver = {
.name = "tape_3590", .name = "tape_3590",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.ids = tape_3590_ids, .ids = tape_3590_ids,
.probe = tape_generic_probe, .probe = tape_generic_probe,
.remove = tape_generic_remove, .remove = tape_generic_remove,
.set_offline = tape_3590_offline, .set_offline = tape_generic_offline,
.set_online = tape_3590_online, .set_online = tape_3590_online,
}; };
......
...@@ -387,8 +387,11 @@ tape_cleanup_device(struct tape_device *device) ...@@ -387,8 +387,11 @@ tape_cleanup_device(struct tape_device *device)
* Manual offline is only allowed while the drive is not in use. * Manual offline is only allowed while the drive is not in use.
*/ */
int int
tape_generic_offline(struct tape_device *device) tape_generic_offline(struct ccw_device *cdev)
{ {
struct tape_device *device;
device = cdev->dev.driver_data;
if (!device) { if (!device) {
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册