From: Daeseok Youn Date: Sat, 9 Aug 2014 05:37:39 +0000 (+0900) Subject: staging: dgap: cleanup duplicated warning message on dgap_tty_init() X-Git-Tag: v3.18-rc1~130^2~1416 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35edf11bed147a8fe1df529035ccb551d671916d;p=karo-tx-linux.git staging: dgap: cleanup duplicated warning message on dgap_tty_init() If true_count is not same with brd->nasync, warning messages are printed. But it has duplicated messages within if statement. Signed-off-by: Daeseok Youn Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index b1253c01acce..51f9ebc9e3ce 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -1374,19 +1374,14 @@ static int dgap_tty_init(struct board_t *brd) brd->nasync = brd->maxports; if (true_count != brd->nasync) { - if ((brd->type == PPCM) && (true_count == 64)) { - pr_warn("dgap: %s configured for %d ports, has %d ports.\n", - brd->name, brd->nasync, true_count); - pr_warn("dgap: Please make SURE the EBI cable running from the card\n"); - pr_warn("dgap: to each EM module is plugged into EBI IN!\n"); - } else if ((brd->type == PPCM) && (true_count == 0)) { - pr_warn("dgap: %s configured for %d ports, has %d ports.\n", - brd->name, brd->nasync, true_count); + pr_warn("dgap: %s configured for %d ports, has %d ports.\n", + brd->name, brd->nasync, true_count); + + if ((brd->type == PPCM) && + (true_count == 64 || true_count == 0)) { pr_warn("dgap: Please make SURE the EBI cable running from the card\n"); pr_warn("dgap: to each EM module is plugged into EBI IN!\n"); - } else - pr_warn("dgap: %s configured for %d ports, has %d ports.\n", - brd->name, brd->nasync, true_count); + } brd->nasync = true_count;