Skip to content

Commit 6ffa4d1

Browse files
julianwiedmanndavem330
authored andcommitted
s390/qeth: remove unimplemented gdev routines
prepare() and complete() are not implemented by any discipline, so just drop all the indirection. Signed-off-by: Julian Wiedmann <[email protected]> Reviewed-by: Hans Wippel <[email protected]> Reviewed-by: Thomas Richter <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 41fc3b6 commit 6ffa4d1

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

drivers/s390/net/qeth_core.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,6 @@ struct qeth_discipline {
710710
void (*remove) (struct ccwgroup_device *);
711711
int (*set_online) (struct ccwgroup_device *);
712712
int (*set_offline) (struct ccwgroup_device *);
713-
int (*prepare) (struct ccwgroup_device *);
714-
void (*complete) (struct ccwgroup_device *);
715713
int (*freeze)(struct ccwgroup_device *);
716714
int (*thaw) (struct ccwgroup_device *);
717715
int (*restore)(struct ccwgroup_device *);

drivers/s390/net/qeth_core_main.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5756,21 +5756,6 @@ static void qeth_core_shutdown(struct ccwgroup_device *gdev)
57565756
qdio_free(CARD_DDEV(card));
57575757
}
57585758

5759-
static int qeth_core_prepare(struct ccwgroup_device *gdev)
5760-
{
5761-
struct qeth_card *card = dev_get_drvdata(&gdev->dev);
5762-
if (card->discipline && card->discipline->prepare)
5763-
return card->discipline->prepare(gdev);
5764-
return 0;
5765-
}
5766-
5767-
static void qeth_core_complete(struct ccwgroup_device *gdev)
5768-
{
5769-
struct qeth_card *card = dev_get_drvdata(&gdev->dev);
5770-
if (card->discipline && card->discipline->complete)
5771-
card->discipline->complete(gdev);
5772-
}
5773-
57745759
static int qeth_core_freeze(struct ccwgroup_device *gdev)
57755760
{
57765761
struct qeth_card *card = dev_get_drvdata(&gdev->dev);
@@ -5805,8 +5790,8 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
58055790
.set_online = qeth_core_set_online,
58065791
.set_offline = qeth_core_set_offline,
58075792
.shutdown = qeth_core_shutdown,
5808-
.prepare = qeth_core_prepare,
5809-
.complete = qeth_core_complete,
5793+
.prepare = NULL,
5794+
.complete = NULL,
58105795
.freeze = qeth_core_freeze,
58115796
.thaw = qeth_core_thaw,
58125797
.restore = qeth_core_restore,

0 commit comments

Comments
 (0)