Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ffa4d1b authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: remove unimplemented gdev routines 



prepare() and complete() are not implemented by any discipline, so just
drop all the indirection.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.vnet.ibm.com>
Reviewed-by: default avatarHans Wippel <hwippel@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41fc3b65

drivers/s390/net/qeth_core.h

+0 −2
Original line number Diff line number Diff line
@@ -710,8 +710,6 @@ struct qeth_discipline { 
	void (*remove) (struct ccwgroup_device *);

	int (*set_online) (struct ccwgroup_device *);

	int (*set_offline) (struct ccwgroup_device *);

	int (*prepare) (struct ccwgroup_device *);

	void (*complete) (struct ccwgroup_device *);

	int (*freeze)(struct ccwgroup_device *);

	int (*thaw) (struct ccwgroup_device *);

	int (*restore)(struct ccwgroup_device *);

drivers/s390/net/qeth_core_main.c

+2 −17
Original line number Diff line number Diff line
@@ -5756,21 +5756,6 @@ static void qeth_core_shutdown(struct ccwgroup_device *gdev) 
	qdio_free(CARD_DDEV(card));

}



static int qeth_core_prepare(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	if (card->discipline && card->discipline->prepare)

		return card->discipline->prepare(gdev);

	return 0;

}



static void qeth_core_complete(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);

	if (card->discipline && card->discipline->complete)

		card->discipline->complete(gdev);

}



static int qeth_core_freeze(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);
@@ -5805,8 +5790,8 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = { 
	.set_online = qeth_core_set_online,

	.set_offline = qeth_core_set_offline,

	.shutdown = qeth_core_shutdown,

	.prepare = qeth_core_prepare,

	.complete = qeth_core_complete,

	.prepare = NULL,

	.complete = NULL,

	.freeze = qeth_core_freeze,

	.thaw = qeth_core_thaw,

	.restore = qeth_core_restore,