From patchwork Thu Mar 9 16:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp385452wrd; Thu, 9 Mar 2023 08:27:17 -0800 (PST) X-Google-Smtp-Source: AK7set9bNoAEYHOY1JH7YwUwv4mz+gHuPqccLCVVw2bjQyzNXWt1h9LgF+TSZsTe3N+cZr6Gl0WB X-Received: by 2002:a17:902:a511:b0:19c:fd9e:f88c with SMTP id s17-20020a170902a51100b0019cfd9ef88cmr1723547plq.18.1678379237637; Thu, 09 Mar 2023 08:27:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379237; cv=none; d=google.com; s=arc-20160816; b=CXTz51jmrgTWIRJ+gpTOKZ3K5d4JayeE1/A6DDE5lEERAMPsmR7fy7BuVf8g5IsvQM DxibDilpBMiKUSdxzKCxoobMJ7ywewuGLDkw/nNZjGhxwHbXRIPeBbVnkmVdABKLEI7j 3473oTIKDLwoMVu3Vmrm2c4d39uYkTsWJfj74u6BlMtBmQWosr0sFzELEc2N9W/GeaPs CkpgZz453SyHPWH+CF0WJMPGFtxdvEIR8xgr7iAuC43F0DaSjoBA2uSRqHP1OO90+GAX epwkewuOjj3E4ezOj7j5rt6umAGiOaO2iI7INsr0OuyCe/xPElJbbU5JDhbO51j+/v/c i5GQ== 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=bdheHRRXPtj0yTkibiJ2+U48OpRbRtaMNPl40pFJdHw=; b=rRJuMm6FJv8zWsf3DuxUdouoT8KNRSli5DL9zDnWjtzd6qDq9Z3hqNkC6Fp12LDQO2 hCh92mxVBw8dbG0wzx7qWQ/xDpyKi34rrZYHK3rxQ3ziMye65lTdHuptbg4/LpRUPz1R 1dzlOlra/HZ3LHd7w9W/D33IoGElEmYOUiUXt4YXHSwWk+XBUM2AiWaUnxUejI0mDFJg IYcuglLbxOvlMNvLy82ffRE74mWjUWGbJynX+pyjmxiphfydraZsbwHtwt3x3EnEZFcM vlDDzDON9JZWoFL/NugaJOfCfSDtMCZXhSKm9xP+ULiwuOaOUU7z6ZMAB2Dv/q57ahPA UTSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LULnSu1W; dkim=neutral (no key) header.i=@suse.de header.b=CkX4Hr4v; 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 u1-20020a17090282c100b0019905ccbcc1si17362654plz.317.2023.03.09.08.27.04; Thu, 09 Mar 2023 08:27:17 -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=LULnSu1W; dkim=neutral (no key) header.i=@suse.de header.b=CkX4Hr4v; 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 S231928AbjCIQHm (ORCPT + 99 others); Thu, 9 Mar 2023 11:07:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231686AbjCIQC3 (ORCPT ); Thu, 9 Mar 2023 11:02:29 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87025F7EF2; Thu, 9 Mar 2023 08:02:28 -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 40F8E2215B; Thu, 9 Mar 2023 16:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377747; 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=bdheHRRXPtj0yTkibiJ2+U48OpRbRtaMNPl40pFJdHw=; b=LULnSu1WQFER6Ed8rvQ/Bi2/QoM2WGNwzBn6+btAxjSyTr5mIX1CLupgOAqnSmumryoUQt DQHCzkpQeOS4KuagxjaEamyqM8ogLda290xtwFRWLR57fgZyFZVd+/a1PCGe8QRir5G9fF fkjBlfbUzHDYH25/6k2NSjGggWJHZiU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377747; 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=bdheHRRXPtj0yTkibiJ2+U48OpRbRtaMNPl40pFJdHw=; b=CkX4Hr4vitl7H8PIT1SJljwAoToekrnCbjMBjIWNGLi/kNNo195pC0gFZ3gy2rI1X3hNKZ cI72xTaKNEsXbMCg== 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 DA49813A73; Thu, 9 Mar 2023 16:02:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OH11NBIDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:26 +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 056/101] fbdev/platinumfb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:01:16 +0100 Message-Id: <20230309160201.5163-57-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?1759908187445143260?= X-GMAIL-MSGID: =?utf-8?q?1759908187445143260?= 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/platinumfb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c index c7172174c1b7..33bf75309815 100644 --- a/drivers/video/fbdev/platinumfb.c +++ b/drivers/video/fbdev/platinumfb.c @@ -19,6 +19,7 @@ #undef DEBUG +#include #include #include #include @@ -486,14 +487,14 @@ static int platinum_var_to_par(struct fb_var_screeninfo *var, /* * Parse user specified options (`video=platinumfb:') */ -static int __init platinumfb_setup(char *options) +static int __init platinumfb_setup(const char *options) { + struct option_iter iter; 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, "vmode:", 6)) { int vmode = simple_strtoul(this_opt+6, NULL, 0); if (vmode > 0 && vmode <= VMODE_MAX) @@ -516,6 +517,9 @@ static int __init platinumfb_setup(char *options) } } } + + option_iter_release(&iter); + return 0; }