From patchwork Mon Mar 6 15:59:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1924431wrd; Mon, 6 Mar 2023 08:05:50 -0800 (PST) X-Google-Smtp-Source: AK7set+9HTMdWMZZXSTgP5ZsdjGDyZZBNLdy1xWyLdt3vFNQXvtq3j0bumJd8ibD+LkCf4Gwx6Ht X-Received: by 2002:a17:90b:4c50:b0:234:d3a:2a38 with SMTP id np16-20020a17090b4c5000b002340d3a2a38mr11857662pjb.43.1678118749895; Mon, 06 Mar 2023 08:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118749; cv=none; d=google.com; s=arc-20160816; b=iIYhrk4NCtHkEnOtQu4NtumLBt9k9j+ySuHMpnxinA+l1fcRxJ/fV3G2yZ94CSg3ql zr5oLPi4mBUMKriskOFPSKYojyPGPvX7XHqPdEbLxTquestT/B7yXUL38mWPrbnrwPDC xeDOylVy78ooerRpnbe3m6CMgQ5okXDj81QB5GjpyvWv3M2NS4A5GNrJ92hYp/FNoEhv DzRBaqm4JUUhETXMpJbQuVUumnnQIVl/mNV8RTKV+BcYssShEgnr8aUMExxL67OIThxx RHD+ROvyhkqPkegE6cGwcpFwwP+ifDMT3f59dbgO79p+zgDoZDCEiUfABdrZLmo063yi /7lA== 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=FDbqWv5400a+VKgJzOqfkAd4hlorIAaEh2nSCFtvtGc=; b=lGtCgY1eE9ht/MKALVeVM60WbWtUL6vaFQNuKZkb6P0Hl8bFxiov6I9DySLuZhlAur uOxnNojcNAm9R9/h7L0Wqn6TpoMpZZM9MUXvCAwnMoRl3FravbCynSmyYjbLIf0iiO8n kgVPdR7Qe5dUviTQsdrEfZlvDjWt0pM+X8nIrPb1SWci0lfQJrBcXxGbBw2CaH09fFdw x8rEAluV2+Xcc4L/M2Pq85Kv4XeCzDCJDtH87VrEKuN1R6C+ACMGhgDgwzaOgLs2OONq fvrmrvBaepikA9VUlxoMY/zS1XvC17bbOPF2qwIWESWo2oX1C6KZTBcygnZUNHTJt3zC 6tvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=d8KWB8gr; dkim=neutral (no key) header.i=@suse.de header.b=FEvtDlKD; 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 q24-20020a17090aa01800b00238aab7e540si9950181pjp.4.2023.03.06.08.05.35; Mon, 06 Mar 2023 08:05:49 -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=d8KWB8gr; dkim=neutral (no key) header.i=@suse.de header.b=FEvtDlKD; 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 S231388AbjCFQEY (ORCPT + 99 others); Mon, 6 Mar 2023 11:04:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231181AbjCFQAs (ORCPT ); Mon, 6 Mar 2023 11:00:48 -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 917142A6D2; Mon, 6 Mar 2023 08:00:46 -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 21A321FEAA; Mon, 6 Mar 2023 16:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118445; 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=FDbqWv5400a+VKgJzOqfkAd4hlorIAaEh2nSCFtvtGc=; b=d8KWB8grReTsp7EdFmF1dYuc7UjFEFWkdMlnYuY3q2xkxJZiertWS7uNdwfQaags6RMf0m hIRTXaU7d0pcafaAP8un9ei5EufYbVz7YHEw77NlEjgDyBsaOw6K6OIGXT5Wp639lViXXu cAn90eUDM/SN/l3mUnvBpUVwIJAIh/U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118445; 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=FDbqWv5400a+VKgJzOqfkAd4hlorIAaEh2nSCFtvtGc=; b=FEvtDlKDZcdcwsYwN+k/oUaPR0pEpgvBHhrlbpfb/7RX4YyApBKHEby7n2RI1regyZHYuq KTvN+Em66oNmBjDA== 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 BE3F913A6A; Mon, 6 Mar 2023 16:00:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OPWLLSwOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:44 +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 54/99] fbdev/omapfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:31 +0100 Message-Id: <20230306160016.4459-55-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?1759635046215301714?= X-GMAIL-MSGID: =?utf-8?q?1759635046215301714?= 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/omap/omapfb_main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c index 1f3df2055ff0..464a667708db 100644 --- a/drivers/video/fbdev/omap/omapfb_main.c +++ b/drivers/video/fbdev/omap/omapfb_main.c @@ -11,6 +11,7 @@ * Dirk Behme - changes for 2.6 kernel API * Texas Instruments - H3 support */ +#include #include #include #include @@ -1842,17 +1843,17 @@ static struct platform_driver omapfb_driver = { #ifndef MODULE /* Process kernel command line parameters */ -static int __init omapfb_setup(char *options) +static int __init omapfb_setup(const char *options) { - char *this_opt = NULL; + struct option_iter iter; + const char *this_opt; int r = 0; pr_debug("omapfb: options %s\n", options); - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while (!r && (this_opt = strsep(&options, ",")) != NULL) { + while (option_iter_next(&iter, this_opt)) { if (!strncmp(this_opt, "accel", 5)) def_accel = 1; else if (!strncmp(this_opt, "vram:", 5)) { @@ -1893,6 +1894,8 @@ static int __init omapfb_setup(char *options) } } + option_iter_release(&iter); + return r; }