hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <jwi@linux.vnet.ibm.com>
Reviewed-by: Hans Wippel <hwippel@linux.vnet.ibm.com>
Reviewed-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2017-04-11 16:11:19 +02:00 committed by David S. Miller
parent 41fc3b6567
commit 6ffa4d1bbe
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/net/qeth_core.h
View File

@ -710,8 +710,6 @@ struct qeth_discipline {
void (*remove) (struct ccwgroup_device *); void (*remove) (struct ccwgroup_device *);
int (*set_online) (struct ccwgroup_device *); int (*set_online) (struct ccwgroup_device *);
int (*set_offline) (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 (*freeze)(struct ccwgroup_device *);
int (*thaw) (struct ccwgroup_device *); int (*thaw) (struct ccwgroup_device *);
int (*restore)(struct ccwgroup_device *); int (*restore)(struct ccwgroup_device *);

19
drivers/s390/net/qeth_core_main.c
View File

@ -5756,21 +5756,6 @@ static void qeth_core_shutdown(struct ccwgroup_device *gdev)
qdio_free(CARD_DDEV(card)); 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) static int qeth_core_freeze(struct ccwgroup_device *gdev)
{ {
struct qeth_card *card = dev_get_drvdata(&gdev->dev); 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_online = qeth_core_set_online,
.set_offline = qeth_core_set_offline, .set_offline = qeth_core_set_offline,
.shutdown = qeth_core_shutdown, .shutdown = qeth_core_shutdown,
.prepare = qeth_core_prepare, .prepare = NULL,
.complete = qeth_core_complete, .complete = NULL,
.freeze = qeth_core_freeze, .freeze = qeth_core_freeze,
.thaw = qeth_core_thaw, .thaw = qeth_core_thaw,
.restore = qeth_core_restore, .restore = qeth_core_restore,