From patchwork Thu Mar 9 16:00:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 67022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp389928wrd; Thu, 9 Mar 2023 08:35:54 -0800 (PST) X-Google-Smtp-Source: AK7set+CGjdmx8w/gY/8akAWlz0PbZ64nHgg+9FsWmxa7sQLfGxn9QyhE2Je7fr8KhDAruThjgqQ X-Received: by 2002:a92:8e0d:0:b0:318:d56e:9efa with SMTP id c13-20020a928e0d000000b00318d56e9efamr2141401ild.24.1678379753758; Thu, 09 Mar 2023 08:35:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379753; cv=none; d=google.com; s=arc-20160816; b=h17RewHaK5DLRuJ2CYWr/U97y0Cv8AmrIyNsKFA1CpADAX8ySC4nhiIYg7aN50916H mt7iZ7iZF6ST79nYauIlkXvLa/OmeUlSI5RIdOHBhcXkip/C7wzv5zsNfFhhubcfM5hZ HcBwiMwur+fCiWQQS4+2IHZtwZf7jniSREZRHxxsWqFo4FMHxijXyM8ODJk+wzqSXLgm AYPxmEatf7lEzPkv96ijTFGM3NEngUn96sbh+3HnTlrje9mkw94ogKNIdA3VZ557c6BY mgvyXFIJq9VJJe8gcz6x/cj+a8IUHgXGrLRBRxfLUHUTo/dS0PeGRXfke5APWXFDgt6O cUVg== 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=MA6x97k7aP7QRzZKpKQzdIkdDwykRU28DukMccXbTyw=; b=oqqfA+x5NncwP+CE6yifnMwZYSQI2HpsfQZy/WbV16ENk3P4MOuk0fUozN/wXQ0+GT ErRZqmfKsbMHxMl8bEstJX1MyvBP7GvgzkG/I6ea6eVvd8ic1eQvafwOTiAXpllUQ1Iy ZFuaz+Nv/XBy18sEaTFlbvusP8It7G0EF7PxLerETdCF/IHvF+QKOVXBrjfepfUbSH+0 snf9+QdJXLl9xVICquJMU3zHTy7g/NQv1/KmMjSIpkF9GY9aU45EmZeqgRCBQF3mXzNh 4qc5JigD4eadC6MneSlYussIfr1gsUngFHa+54wH7J2WkA7hu1i7rYp6Z4iC/4IDFLFm Mpwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=vSx80YLI; dkim=neutral (no key) header.i=@suse.de; 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 j22-20020a02cc76000000b003c3efbcf077si18846406jaq.151.2023.03.09.08.35.39; Thu, 09 Mar 2023 08:35:53 -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=vSx80YLI; dkim=neutral (no key) header.i=@suse.de; 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 S231807AbjCIQDF (ORCPT + 99 others); Thu, 9 Mar 2023 11:03:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231193AbjCIQCJ (ORCPT ); Thu, 9 Mar 2023 11:02:09 -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 6C7A7F4002; Thu, 9 Mar 2023 08:02:08 -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 8D9EA20179; Thu, 9 Mar 2023 16:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377726; 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=MA6x97k7aP7QRzZKpKQzdIkdDwykRU28DukMccXbTyw=; b=vSx80YLIE+D2jM1cCMS/+8ygwlbFykEO6KrFcXuVzkXiu9kUO1tow2qtWn2dmIzpDg0NDM CcvgasHR9tf3WVBK4Lt/u0HkOq94BksvpDB3daCbqRM7oyGSigF0h6YYnjPgQ/DLPhU/I4 i32iGBhQaHOmk6+9264asGqdRM4P4b8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377726; 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=MA6x97k7aP7QRzZKpKQzdIkdDwykRU28DukMccXbTyw=; b=kWwyOmkQAc3/zuQ9YjPsTcffs0NoczG7MRwySa+PIUHqhwUS6t8NyTcYprHLCuKXHkEikw f8er8WNqYjf6asAA== 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 29EFF1391B; Thu, 9 Mar 2023 16:02:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OD80Cf4CCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:06 +0000 From: Thomas Zimmermann To: deller@gmx.de, geert+renesas@glider.be, timur@kernel.org, rdunlap@infradead.org, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 005/101] fbdev/acornfb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:00:25 +0100 Message-Id: <20230309160201.5163-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309160201.5163-1-tzimmermann@suse.de> References: <20230309160201.5163-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?1759908728611615586?= X-GMAIL-MSGID: =?utf-8?q?1759908728611615586?= 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/acornfb.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/acornfb.c b/drivers/video/fbdev/acornfb.c index 8642136a6bdc..3fed89e03554 100644 --- a/drivers/video/fbdev/acornfb.c +++ b/drivers/video/fbdev/acornfb.c @@ -14,6 +14,7 @@ * - Blanking 8bpp displays with VIDC */ +#include #include #include #include @@ -879,17 +880,15 @@ static struct options { { NULL, NULL } }; -static int acornfb_setup(char *options) +static int acornfb_setup(const char *options) { - struct options *optp; + struct option_iter iter; char *opt; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while ((opt = strsep(&options, ",")) != NULL) { - if (!*opt) - continue; + while (option_iter_next(&iter, &opt)) { + struct options *optp; for (optp = opt_table; optp->name; optp++) { int optlen; @@ -907,6 +906,9 @@ static int acornfb_setup(char *options) printk(KERN_ERR "acornfb: unknown parameter: %s\n", opt); } + + option_iter_release(&iter); + return 0; }