Commit 4d7a3cdfb4c9aa1e2ce61f3b16b24eb6acf6726d
Committed by
Martin Schwidefsky
Martin Schwidefsky
1 parent
e1c805309d
Exists in
master
and in
7 other branches
[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: Frank Munzert <munzert@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Showing 4 changed files with 7 additions and 16 deletions Side-by-side Diff
drivers/s390/char/tape.h
| ... | ... | @@ -285,7 +285,7 @@ |
| 285 | 285 | extern void tape_state_set(struct tape_device *, enum tape_state); |
| 286 | 286 | |
| 287 | 287 | extern int tape_generic_online(struct tape_device *, struct tape_discipline *); |
| 288 | -extern int tape_generic_offline(struct tape_device *device); | |
| 288 | +extern int tape_generic_offline(struct ccw_device *); | |
| 289 | 289 | |
| 290 | 290 | /* Externals from tape_devmap.c */ |
| 291 | 291 | extern int tape_generic_probe(struct ccw_device *); |
drivers/s390/char/tape_34xx.c
| ... | ... | @@ -1294,12 +1294,6 @@ |
| 1294 | 1294 | ); |
| 1295 | 1295 | } |
| 1296 | 1296 | |
| 1297 | -static int | |
| 1298 | -tape_34xx_offline(struct ccw_device *cdev) | |
| 1299 | -{ | |
| 1300 | - return tape_generic_offline(cdev->dev.driver_data); | |
| 1301 | -} | |
| 1302 | - | |
| 1303 | 1297 | static struct ccw_driver tape_34xx_driver = { |
| 1304 | 1298 | .name = "tape_34xx", |
| 1305 | 1299 | .owner = THIS_MODULE, |
| ... | ... | @@ -1307,7 +1301,7 @@ |
| 1307 | 1301 | .probe = tape_generic_probe, |
| 1308 | 1302 | .remove = tape_generic_remove, |
| 1309 | 1303 | .set_online = tape_34xx_online, |
| 1310 | - .set_offline = tape_34xx_offline, | |
| 1304 | + .set_offline = tape_generic_offline, | |
| 1311 | 1305 | }; |
| 1312 | 1306 | |
| 1313 | 1307 | static int |
drivers/s390/char/tape_3590.c
| ... | ... | @@ -1707,19 +1707,13 @@ |
| 1707 | 1707 | &tape_discipline_3590); |
| 1708 | 1708 | } |
| 1709 | 1709 | |
| 1710 | -static int | |
| 1711 | -tape_3590_offline(struct ccw_device *cdev) | |
| 1712 | -{ | |
| 1713 | - return tape_generic_offline(cdev->dev.driver_data); | |
| 1714 | -} | |
| 1715 | - | |
| 1716 | 1710 | static struct ccw_driver tape_3590_driver = { |
| 1717 | 1711 | .name = "tape_3590", |
| 1718 | 1712 | .owner = THIS_MODULE, |
| 1719 | 1713 | .ids = tape_3590_ids, |
| 1720 | 1714 | .probe = tape_generic_probe, |
| 1721 | 1715 | .remove = tape_generic_remove, |
| 1722 | - .set_offline = tape_3590_offline, | |
| 1716 | + .set_offline = tape_generic_offline, | |
| 1723 | 1717 | .set_online = tape_3590_online, |
| 1724 | 1718 | }; |
| 1725 | 1719 |
drivers/s390/char/tape_core.c
| ... | ... | @@ -387,8 +387,11 @@ |
| 387 | 387 | * Manual offline is only allowed while the drive is not in use. |
| 388 | 388 | */ |
| 389 | 389 | int |
| 390 | -tape_generic_offline(struct tape_device *device) | |
| 390 | +tape_generic_offline(struct ccw_device *cdev) | |
| 391 | 391 | { |
| 392 | + struct tape_device *device; | |
| 393 | + | |
| 394 | + device = cdev->dev.driver_data; | |
| 392 | 395 | if (!device) { |
| 393 | 396 | return -ENODEV; |
| 394 | 397 | } |