From patchwork Thu Mar 9 16:01: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: 67000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp389018wrd; Thu, 9 Mar 2023 08:34:08 -0800 (PST) X-Google-Smtp-Source: AK7set9i8xusJukoTzmlPjxxoqJ1Cd0ppMw9IHxKmGvfeqDhgmjI2wXEK0KmvWKmJgeUPCKBuGak X-Received: by 2002:a17:902:e84b:b0:19c:b7da:fc44 with SMTP id t11-20020a170902e84b00b0019cb7dafc44mr26847478plg.34.1678379648097; Thu, 09 Mar 2023 08:34:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379648; cv=none; d=google.com; s=arc-20160816; b=WHyBN2ZEzMeTnS9ulTi2DNog/5oSuYYOq+4Sf/h4juDrXSP9CRkYsJdZ9gXOFs9aAj HzFBKZs90KuoYBPsD/mYCwSodPgquxA7matl4E4C0DMKVliPE3FfdPNlWrtqJmv+LgTv H+2rxLj7yJmVXEaaPoTkcIPQ+m59CYPgsiysIE0VAbat16LMpbPM97aVhtGOnNrRM3DI by6JEUzycluWNh1EOrns4hsUNrOr+8UcQotcT6a85W22kghZUvPeF/IFQdnJtHLQqDLM KAhUA58JpqfEUQyOdPjdhv0FwvuL82+mJJQm+I0rruAQYtJiRQ1XTTXDnLc01zLO2XUO hCog== 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=CsLXoWVq0oVkycpG6cywKJmSZDW0W9mttSoEkq92BAA=; b=iPsTjxgJgzA9S7jHjVTOeadJi7kNbHUXzhT75ITMvi4xSDkcCy75Up71hsqesx813+ TNJzx+V9SJ+M2OfRQJjbBBraYu1s+P2U+1e8rG8EOXZPY7dSRThPjgmLE0HLbVmm+dts VCYePjEnc1toa+aia9wKhxXZFwTVPGAoGyvUcM4vLrlw0qfcz0w1SwcEziCOdbZuLcBE IxQG27hjucFcF2s2J4E6dhyBi/DsV0TABUqQlNWNyUmfkiHio0yqrontqNddUFBvRJsl Dr6ox/7RdfKE1qBjAF23ep2U99ziah5WQe3NJia6dutBHhyWM5lYAnG8GQLMxTHTJm+x k7fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=VqJgOkH8; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 lf6-20020a170902fb4600b0019edb734770si8058333plb.635.2023.03.09.08.33.52; Thu, 09 Mar 2023 08:34:08 -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=VqJgOkH8; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 S231610AbjCIQHd (ORCPT + 99 others); Thu, 9 Mar 2023 11:07:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231667AbjCIQC0 (ORCPT ); Thu, 9 Mar 2023 11:02:26 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34844F7ED7; Thu, 9 Mar 2023 08:02:24 -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-out1.suse.de (Postfix) with ESMTPS id 9829222157; Thu, 9 Mar 2023 16:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377742; 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=CsLXoWVq0oVkycpG6cywKJmSZDW0W9mttSoEkq92BAA=; b=VqJgOkH85wpepK8t/nG/myX7s+/stYVpojzuzc5YsN7/c9HgpiuimUpvtwIT3AQAlPPzZ7 nuRStiAxj+utM8o4scM/oviLSkAtx388ZVR8Afhfye44Va1CDjEgmM7rfQ/tYqMTfyASkw wMmop9TyGQPU+5i6VN8U4m61I0PRGqM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377742; 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=CsLXoWVq0oVkycpG6cywKJmSZDW0W9mttSoEkq92BAA=; b=a1ZNaaHEc5m7bOfGZxxqdIVgcWq6fcePeDHAj20hxoGD/xUVmPHGR1CnHGuDIaHlmw0GuN ldwEx6ZXTyIBMfDQ== 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 431511391B; Thu, 9 Mar 2023 16:02:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CAFvDw4DCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:22 +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 044/101] fbdev/macfb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:01:04 +0100 Message-Id: <20230309160201.5163-45-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?1759908618066629331?= X-GMAIL-MSGID: =?utf-8?q?1759908618066629331?= 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/macfb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/macfb.c b/drivers/video/fbdev/macfb.c index 44ff860a3f37..c7e17a14daf1 100644 --- a/drivers/video/fbdev/macfb.c +++ b/drivers/video/fbdev/macfb.c @@ -20,6 +20,7 @@ * http://rajsky.psych.nyu.edu/Tips/VideoBugs.html */ +#include #include #include #include @@ -504,23 +505,22 @@ static const struct fb_ops macfb_ops = { .fb_imageblit = cfb_imageblit, }; -static void __init macfb_setup(char *options) +static void __init macfb_setup(const char *options) { + struct option_iter iter; char *this_opt; - if (!options || !*options) - return; - - while ((this_opt = strsep(&options, ",")) != NULL) { - if (!*this_opt) - continue; + option_iter_init(&iter, options); + while (option_iter_next(&iter, &this_opt)) { if (!strcmp(this_opt, "inverse")) fb_invert_cmaps(); else if (!strcmp(this_opt, "vidtest")) vidtest = 1; /* enable experimental CLUT code */ } + + option_iter_release(&iter); } static void __init iounmap_macfb(void)