From patchwork Mon Mar 6 15:59:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1923144wrd; Mon, 6 Mar 2023 08:04:03 -0800 (PST) X-Google-Smtp-Source: AK7set/28op66z3bW8BvW6mGqpPsASnHZ/Rwj+tlOON+unVZ9B1OZpR21ItRluaIeUuS2evMIec8 X-Received: by 2002:a17:902:d549:b0:19c:be09:20d5 with SMTP id z9-20020a170902d54900b0019cbe0920d5mr13325274plf.11.1678118643720; Mon, 06 Mar 2023 08:04:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118643; cv=none; d=google.com; s=arc-20160816; b=ze0tA0kREDDyWw6WBxf9NukIoTos0g1qUtEGm4PoqPL4DuhnMXH9tW+A4RPi0gQ6TN g7gQP7wXC/7phzXdvUEMqes2D+NQxViRtM9yFjPjS6NmzsWf8iDz3OnFv4hNj5Q0gacX K4ct7L1+Rn6m+coLEfRQeoRk7TWwrU1ELq8Ya+wB3m5PW/+kbyNbg6oC3ufPgDxbZxnV DAS3Ft9kOmmhGu+PLDEKEooEbORaqp8PLT88wfOxCwbGQ+h6Ty5j/8v59TwbF+kYJ4yS aIOPOufLMAkr0Oata9o4RAXM+jsJaM7QY6/J1Qi+iuIlosfFWQr3ZnaeNatZGHBY1vQ6 NZSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ACmxitiOteI6mi9z0BgBQ/16D1s/Eul8G7DwC8i4fUY=; b=WblDx0a2AMaPwLw9rCTDjf57hcM3fOKWDqOM3HkdnhpAVMi6caOO7RBvRuBNZs2AI9 23gooNilKVgaoK/pZ992z6eYTwRRLOfHq3UDx4+u1y/EOYtaClxe0liO4ZZE8vsxOGRz yJXQlRn6XlVS1qu6IAscwlArcrRsakvzGIBLqXahNRwwo/J4PFMOKsudnNGsXIZIR85G iC/IlFnmk5wlSmsHmsuD4QsOagAkk/+ydrEKsafagoRNxlsZbnWsHjXy2kYH+5mTAWwV cS8EcjqwcQg7R4zP3b3NjjYJN0L29/5+GcKl4uZgOSvwkf1dLk+sRN8jA+Luz9tJKcw2 OTkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=agFGvjCc; dkim=neutral (no key) header.i=@suse.de header.b=zGQGSCh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kh14-20020a170903064e00b0019e30e492b3si9364674plb.200.2023.03.06.08.03.47; Mon, 06 Mar 2023 08:04:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=agFGvjCc; dkim=neutral (no key) header.i=@suse.de header.b=zGQGSCh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjCFQCY (ORCPT + 99 others); Mon, 6 Mar 2023 11:02:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230417AbjCFQAg (ORCPT ); Mon, 6 Mar 2023 11:00:36 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A02DA2E0FB; Mon, 6 Mar 2023 08:00:35 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 567171FE0B; Mon, 6 Mar 2023 16:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118434; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ACmxitiOteI6mi9z0BgBQ/16D1s/Eul8G7DwC8i4fUY=; b=agFGvjCcIAnoCBZPbPcoRWKEeBcQjj4jGbuaZWlzGXf7CeQ/K/b8KZ5BXf1UvGDvQgTA0W II2Q/E2hv3CAMmY4wNlgUi390KReXar+ihBinjwMPuKWLCL2GwQmKj4mgMMBYMRN/0x5FU Td76lF0lEWkmjgOIzqo2tYja9ScHbGA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118434; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ACmxitiOteI6mi9z0BgBQ/16D1s/Eul8G7DwC8i4fUY=; b=zGQGSCh49AibU4o0tE11q5r6bDGen1nUV0vNfXlzFWtgegrLutSY7a9TMGIdOI2+EuhTHD p7OKwUQ9GOpcqvBQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EEA5813513; Mon, 6 Mar 2023 16:00:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +OtpOSEOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:33 +0000 From: Thomas Zimmermann To: deller@gmx.de, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, timur@kernel.org, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, spock@gentoo.org, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, geert+renesas@glider.be, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 27/99] fbdev/geode: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:04 +0100 Message-Id: <20230306160016.4459-28-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306160016.4459-1-tzimmermann@suse.de> References: <20230306160016.4459-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759634934822222656?= X-GMAIL-MSGID: =?utf-8?q?1759634934822222656?= Use struct option_iter to walk over the individual options in the driver's option string. Replaces the hand-written strsep() loop with a clean interface. The helpers for struct option_iter handle empty option strings and empty options transparently. The struct's _init and _release functions duplicate and release the option string's memory buffer as needed. Done in preparation of constifying the option string. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/geode/gx1fb_core.c | 16 ++++++++-------- drivers/video/fbdev/geode/gxfb_core.c | 17 ++++++++--------- drivers/video/fbdev/geode/lxfb_core.c | 14 ++++++-------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/geode/gx1fb_core.c b/drivers/video/fbdev/geode/gx1fb_core.c index 9c942001ac10..dd1dc7ee7f83 100644 --- a/drivers/video/fbdev/geode/gx1fb_core.c +++ b/drivers/video/fbdev/geode/gx1fb_core.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -403,17 +404,14 @@ static void gx1fb_remove(struct pci_dev *pdev) } #ifndef MODULE -static void __init gx1fb_setup(char *options) +static void __init gx1fb_setup(const char *options) { - char *this_opt; + struct option_iter iter; + const char *this_opt; - if (!options || !*options) - return; - - while ((this_opt = strsep(&options, ","))) { - if (!*this_opt) - continue; + option_iter_init(&iter, options); + while (option_iter_next(&iter, this_opt)) { if (!strncmp(this_opt, "mode:", 5)) strscpy(mode_option, this_opt + 5, sizeof(mode_option)); else if (!strncmp(this_opt, "crt:", 4)) @@ -423,6 +421,8 @@ static void __init gx1fb_setup(char *options) else strscpy(mode_option, this_opt, sizeof(mode_option)); } + + option_iter_release(&iter); } #endif diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c index 3ed85d2d53e9..f5e88e92ba16 100644 --- a/drivers/video/fbdev/geode/gxfb_core.c +++ b/drivers/video/fbdev/geode/gxfb_core.c @@ -16,6 +16,7 @@ * 16 MiB of framebuffer memory is assumed to be available. */ #include +#include #include #include #include @@ -488,21 +489,17 @@ static struct pci_driver gxfb_driver = { }; #ifndef MODULE -static int __init gxfb_setup(char *options) +static int __init gxfb_setup(const char *options) { + struct option_iter iter; + const char *opt; - char *opt; + option_iter_init(&iter, options); - if (!options || !*options) - return 0; - - while ((opt = strsep(&options, ",")) != NULL) { + while (option_iter_next(&iter, opt)) { static char mode_option_buf[256]; int ret; - if (!*opt) - continue; - ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", opt); if (WARN(ret < 0, "gxfb: ignoring invalid option, ret=%d\n", ret)) continue; @@ -511,6 +508,8 @@ static int __init gxfb_setup(char *options) mode_option = mode_option_buf; } + option_iter_release(&iter); + return 0; } #endif diff --git a/drivers/video/fbdev/geode/lxfb_core.c b/drivers/video/fbdev/geode/lxfb_core.c index 6e1e73a21bdb..d687054cdb09 100644 --- a/drivers/video/fbdev/geode/lxfb_core.c +++ b/drivers/video/fbdev/geode/lxfb_core.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -618,17 +619,14 @@ static struct pci_driver lxfb_driver = { }; #ifndef MODULE -static int __init lxfb_setup(char *options) +static int __init lxfb_setup(const char *options) { - char *opt; + struct option_iter iter; + const char *opt; - if (!options || !*options) - return 0; - - while ((opt = strsep(&options, ",")) != NULL) { - if (!*opt) - continue; + option_iter_init(&iter, options); + while (option_iter_next(&iter, opt)) { if (!strcmp(opt, "noclear")) noclear = 1; else if (!strcmp(opt, "nopanel"))