From patchwork Mon Mar 6 15:59:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1924281wrd; Mon, 6 Mar 2023 08:05:35 -0800 (PST) X-Google-Smtp-Source: AK7set8g5qcnR2Gym4EOTOhhPz9YeeNkzJs4U9l5XQn+25tOqoL3bqDoWRZVDW6Xwd+94t+241k8 X-Received: by 2002:a05:6a20:2a29:b0:cc:75b8:7cba with SMTP id e41-20020a056a202a2900b000cc75b87cbamr10172305pzh.43.1678118735564; Mon, 06 Mar 2023 08:05:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118735; cv=none; d=google.com; s=arc-20160816; b=Su1a2hHXV8zeBvU25Hbx3P3j1hxqPbsqQ/t1eAR1eNueYT+bv3o1R3c+0ariHM4BQJ OhkM/WdcbgV1TPVUu/c/KgkGGWRlOqZ+Y7DSNN5LKU3njUZw0+GA9DtcuAPGI/aP0iQJ bjKWdZ40exdAuDrlN45/PurF6IXWAvA6yJc2dzy+eVYaHX2BGl8K26t7ysxTeKKLBmKM KM8MMQCMCoI0VO3Md8FfqZjEw5n+0pa0BFkk+VcnIfCakd5VEo+A2NKtb/CktJXI6xhS ithlUXlz9bbI71c1DW/aIEKieERcTG6s4n9c1QYg1aKAyrg7IXwe8kJ9A/4bnImbntmY NIjw== 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=JtbWzX++GGWbJi+6VWECCdUUEYcE0hx5AMmoDw+mBo0=; b=imwnR0ODfDOG6PZtv0ujK7CJUZXWajTLQNT8BJl1oRYu1NHr7yasXkOMhD3iDqROyZ XPavaq3vC/5ZYKPNMAcz0d3waZeNJr3EsSuZLuyiYh91/iVUroKqNb01+1hYj6S9VVwB 0mVDiYwSUboQP0BdPcVUqXsfHCh9cFlYjjLEzZLBLWIu7BXXNeqozeseavp4OH6k7jCc qx/d4dDDj0xvSp9OjiPA9kQwVrL7UkUhIB1CuX/B8bQbkuTohnayY1PsJ8nOL5ntzs3m veCFXQAg1yF4q2XmkE2BMxE7cryrPdW+/SY1Y4SKQ0vfACZv+TOBg5mRsZhCISwfV7Vo pJsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=hoAdTAlS; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wIOz3uCC; 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 z3-20020aa79e43000000b005a8a9d14496si9075560pfq.47.2023.03.06.08.05.20; Mon, 06 Mar 2023 08:05:35 -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=hoAdTAlS; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=wIOz3uCC; 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 S230430AbjCFQDM (ORCPT + 99 others); Mon, 6 Mar 2023 11:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229952AbjCFQAm (ORCPT ); Mon, 6 Mar 2023 11:00:42 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 040C2311E5; Mon, 6 Mar 2023 08:00:40 -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 99953223DA; Mon, 6 Mar 2023 16:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118439; 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=JtbWzX++GGWbJi+6VWECCdUUEYcE0hx5AMmoDw+mBo0=; b=hoAdTAlSWRWIS8eldmOwiIJ4f+Vg2uQDTsTusRwTAWOkeI47A15NIY23hQXLlTxTFXQduQ 0EI58wO/yiBVJ7VKAWVfYaGJwum1Jv6wOtcpXtBdidtKpgLQra+J7LDiopldk04/9TNyBs K4USCU4wP15UtxQ7BcbrGiJDNadof1Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118439; 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=JtbWzX++GGWbJi+6VWECCdUUEYcE0hx5AMmoDw+mBo0=; b=wIOz3uCCPRIotkqVBq+Ci4zHjt/k9eTmMhFPLMa6TYXNtnli4Ws8apt9RgJBaliprd9pwj /CE8LaWXXsUf0uCw== 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 3A52B13A6A; Mon, 6 Mar 2023 16:00:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uG5dDScOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:39 +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 40/99] fbdev/imxfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:17 +0100 Message-Id: <20230306160016.4459-41-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?1759635031131085537?= X-GMAIL-MSGID: =?utf-8?q?1759635031131085537?= 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/imxfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 34cd4d4fd137..950df484e5be 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -14,6 +14,7 @@ * linux-arm-kernel@lists.arm.linux.org.uk */ +#include #include #include #include @@ -845,21 +846,19 @@ static struct lcd_ops imxfb_lcd_ops = { static int imxfb_setup(void) { - char *opt, *options = NULL; + char *options = NULL; + struct option_iter iter; + const char *opt; if (fb_get_options("imxfb", &options)) return -ENODEV; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - 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, "imxfb: ignoring invalid option, ret=%d\n", ret)) continue; @@ -868,6 +867,8 @@ static int imxfb_setup(void) fb_mode = mode_option_buf; } + option_iter_release(&iter); + return 0; }