From 1380fee2b553fbde1a094476685f43ec5625aec2 Mon Sep 17 00:00:00 2001 From: Frank Pavlic Date: Wed, 22 Mar 2006 16:03:41 +0100 Subject: [PATCH] s390: qeth driver cleanups [patch 3/6] s390: qeth driver cleanups From: Ursula Braun - code analyzing tool BEAM has found some unreachable and unnecessary statements and also conditions which are always true. - removed some useless MII code since OSA card will never allow to set such values. Signed-off-by: Frank Pavlic diffstat: qeth_main.c | 49 ++++--------------------------------------------- qeth_proc.c | 18 +++++++++--------- qeth_sys.c | 2 +- 3 files changed, 14 insertions(+), 55 deletions(-) Signed-off-by: Jeff Garzik --- drivers/s390/net/qeth_proc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/s390/net/qeth_proc.c') diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c index 1304641545df..360d782c7ada 100644 --- a/drivers/s390/net/qeth_proc.c +++ b/drivers/s390/net/qeth_proc.c @@ -74,7 +74,7 @@ qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset) static inline const char * qeth_get_router_str(struct qeth_card *card, int ipv) { - int routing_type = 0; + enum qeth_routing_types routing_type = NO_ROUTER; if (ipv == 4) { routing_type = card->options.route4.type; @@ -86,26 +86,26 @@ qeth_get_router_str(struct qeth_card *card, int ipv) #endif /* CONFIG_QETH_IPV6 */ } - if (routing_type == PRIMARY_ROUTER) + switch (routing_type){ + case PRIMARY_ROUTER: return "pri"; - else if (routing_type == SECONDARY_ROUTER) + case SECONDARY_ROUTER: return "sec"; - else if (routing_type == MULTICAST_ROUTER) { + case MULTICAST_ROUTER: if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO) return "mc+"; return "mc"; - } else if (routing_type == PRIMARY_CONNECTOR) { + case PRIMARY_CONNECTOR: if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO) return "p+c"; return "p.c"; - } else if (routing_type == SECONDARY_CONNECTOR) { + case SECONDARY_CONNECTOR: if (card->info.broadcast_capable == QETH_BROADCAST_WITHOUT_ECHO) return "s+c"; return "s.c"; - } else if (routing_type == NO_ROUTER) + default: /* NO_ROUTER */ return "no"; - else - return "unk"; + } } static int -- cgit v1.2.3-59-g8ed1b