From patchwork Mon Mar 6 15:59:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1923403wrd; Mon, 6 Mar 2023 08:04:22 -0800 (PST) X-Google-Smtp-Source: AK7set9X8pP1O2i2rFCeOFth7E85fg/sD+LRJGcaQXsm8NrO7jCCKLICrwspHW9JJnw9sNc/xADc X-Received: by 2002:a17:90b:1c87:b0:236:73d5:82cf with SMTP id oo7-20020a17090b1c8700b0023673d582cfmr11621409pjb.9.1678118662216; Mon, 06 Mar 2023 08:04:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118662; cv=none; d=google.com; s=arc-20160816; b=JYEFKTB7vSQ9HzafJKwHyecGHqUtPLTOQqH1hBdGmuBzSZqu3aP/4rRjl3miexULDk Syid/CkGQ6sSqlOzSwIcFqF2S93UEmf4FwOq4PgRJhxAJLSIlQsr1TRBBRjCNRqXLXRW vF/k4/ifaj6N3G+385gHcKewgJ1bAyb/P6cp36oXVGRBeUTId/QN7eOu2Kbxytrbo1fE ThK81x4qy7gkDfdXP2h6NhU+MTYSf8YSGvQD7GM4EMa+dOYmKPosuqAcxxO9Em+dQtbh LCTKTHo4Irs/7JhdnRkgtqCNsjqKac5Ll8ob8tx46S+H3tkL5/VcSU1OiG+yNk4qfdVS ivPg== 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=u1Vj2hdFriPuAq6eu7C8YZHRTaIjSTKM0OUYtVPbUzk=; b=XM5Nye9L6Y6RaoqRA0iV1E4NSgVIMgsEQjAQrNFMyOhV5z9yS2HDec61sQh5oY5vT2 hPUpUBOonWNnHawqJx+O5o5mLi0ZQDroRxEXbsK/s9S3OMhA4jyHUJTC3OZwhi6fxUmd 8wwOOkE6sOTCkwzPZBxU7QBCy/pPSIRWO5UtSVoLEzWBNiI3e7OMx7GXf3q9OP5AgZve 8wrahf6gWRqTuXC0CNU7rg+AcyORNEZz1qvvgjMBMdBX7jQ5NOsYVsvfwJ8OudPh4nW5 sGtmMk6ZLywVXvCIfUHHwR+omG6vofC2Tuzbz7tI9IKxREqE1chpdhG3Ft7TMCE55tgW pMWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=NVJcM5+t; 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 y10-20020a17090aa40a00b00233ba274e24si12107088pjp.6.2023.03.06.08.04.05; Mon, 06 Mar 2023 08:04:22 -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=NVJcM5+t; 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 S230021AbjCFQCz (ORCPT + 99 others); Mon, 6 Mar 2023 11:02:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230126AbjCFQAk (ORCPT ); Mon, 6 Mar 2023 11:00:40 -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 4F5922E820; Mon, 6 Mar 2023 08:00:39 -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 04C031FE14; Mon, 6 Mar 2023 16:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118438; 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=u1Vj2hdFriPuAq6eu7C8YZHRTaIjSTKM0OUYtVPbUzk=; b=NVJcM5+tIjVKP36P2s61a81geLBT2XVpk0f49JGUpN36gKTy2EJ9npfGm04wJi6oNyABMQ bOhMpWxD8/HPl7I1+8n3/+4XfiUd87dBUrEYjiShSTB0DDjVwb6hbnlpxrTokTc9mqxDhO 5pFEn7NRrp51TH6y5EEhomLOiPfnclc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118438; 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=u1Vj2hdFriPuAq6eu7C8YZHRTaIjSTKM0OUYtVPbUzk=; b=oUyTvCb7JB9J08x2nUAGyuDJaMojsQtB+ZHQlyLEJYFCPGhkHFN+qOwbnWxxDefF0hD8O8 uAfuSfArup44SOBA== 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 9C43313A6A; Mon, 6 Mar 2023 16:00:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gA4kJSUOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:37 +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 36/99] fbdev/imsttfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:13 +0100 Message-Id: <20230306160016.4459-37-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?1759634954608485220?= X-GMAIL-MSGID: =?utf-8?q?1759634954608485220?= 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/imsttfb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index bea45647184e..fc046886599c 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -1560,16 +1561,16 @@ static void imsttfb_remove(struct pci_dev *pdev) #ifndef MODULE static int __init -imsttfb_setup(char *options) +imsttfb_setup(const char *options) { - char *this_opt; + struct option_iter iter; + const char *this_opt; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while ((this_opt = strsep(&options, ",")) != NULL) { + while (option_iter_next(&iter, this_opt)) { if (!strncmp(this_opt, "font:", 5)) { - char *p; + const char *p; int i; p = this_opt + 5; @@ -1608,6 +1609,9 @@ imsttfb_setup(char *options) } #endif } + + option_iter_release(&iter); + return 0; }