From patchwork Tue Jul 24 01:00:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1229901 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 92B5B3FD4F for ; Tue, 24 Jul 2012 01:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755157Ab2GXBiK (ORCPT ); Mon, 23 Jul 2012 21:38:10 -0400 Received: from marvin.crapouillou.net ([109.190.31.181]:64273 "EHLO marvin.crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755135Ab2GXBiJ (ORCPT ); Mon, 23 Jul 2012 21:38:09 -0400 X-Greylist: delayed 2249 seconds by postgrey-1.27 at vger.kernel.org; Mon, 23 Jul 2012 21:38:09 EDT Received: from acaen-252-1-204-197.w83-115.abo.wanadoo.fr ([83.115.244.197] helo=cerebro.rooms.iriga) by marvin.crapouillou.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1StTUZ-0000ru-Bz; Tue, 24 Jul 2012 03:00:52 +0200 From: Paul Cercueil To: FlorianSchandinat@gmx.de Cc: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, Paul Cercueil Subject: [PATCH 4/4] fbcon: optimize parameters parsing loop. Date: Tue, 24 Jul 2012 03:00:26 +0200 Message-Id: <1343091626-11435-4-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343091626-11435-1-git-send-email-paul@crapouillou.net> References: <1343091626-11435-1-git-send-email-paul@crapouillou.net> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Signed-off-by: Paul Cercueil --- drivers/video/console/fbcon.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 9b83b75..1ecaf68 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -441,8 +441,10 @@ static int __init fb_console_setup(char *this_opt) return 1; while ((options = strsep(&this_opt, ",")) != NULL) { - if (!strncmp(options, "font:", 5)) + if (!strncmp(options, "font:", 5)) { strlcpy(fontname, options + 5, sizeof(fontname)); + continue; + } if (!strncmp(options, "scrollback:", 11)) { char *k; @@ -468,6 +470,7 @@ static int __init fb_console_setup(char *this_opt) /* (k && *k): Check for garbage after the suffix */ if (ret || (k && *k)) printk(KERN_WARNING "fbcon: scrollback: incorrect value.\n"); + continue; } if (!strncmp(options, "map:", 4)) { @@ -484,6 +487,7 @@ static int __init fb_console_setup(char *this_opt) } else { printk(KERN_WARNING "fbcon: map: incorrect value.\n"); } + continue; } if (!strncmp(options, "vc:", 3)) { @@ -513,6 +517,7 @@ static int __init fb_console_setup(char *this_opt) fbcon_is_default = 0; else printk(KERN_WARNING "fbcon: vc: incorrect value.\n"); + continue; } if (!strncmp(options, "rotate:", 7)) { @@ -525,6 +530,7 @@ static int __init fb_console_setup(char *this_opt) } else { printk(KERN_WARNING "fbcon: rotate: incorrect value.\n"); } + continue; } } return 1;