From patchwork Thu Mar 9 16:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 67024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp389953wrd; Thu, 9 Mar 2023 08:36:00 -0800 (PST) X-Google-Smtp-Source: AK7set8PmWatdQoiZdqvzXFiF57HbRKoT+z7DLqA9Lsxg7PCWIZJX+SLvaxtY1SMG4mPDZ13xwu8 X-Received: by 2002:a17:90b:1e4f:b0:237:aed6:fff3 with SMTP id pi15-20020a17090b1e4f00b00237aed6fff3mr22862476pjb.44.1678379759813; Thu, 09 Mar 2023 08:35:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379759; cv=none; d=google.com; s=arc-20160816; b=IjqA71j/VJLSXyEnM4l21IMW1b5ok4lTX2+XIQ5ndOy0nqmRjVsQhIovfb7kkst+Gw wOvdJDe3+fMabkmQCgwTnFejheQmfsKxRpiyaRWnKss0qtiMevbfUPm3yG/gkngvqOEy Mr7OSBMTTaMZimEunGE9mMv4kf0X1VjK1xU2lmrcMmxu8ZaXBhGyzsb3C/0rEJFU8c8/ CHxjdEmT+HkL/WKVqGHQA4ukw0Fh21l0vBfDqtvrTHFMYA7gC/l2/EtB1aa4Tq0QK1+P Adfuop4HgnkPe3qhAqbukgkxTILSJpGn61PCYJGoGZ0k5mftPcAoxIC/apQ6rZS7OXU3 l86w== 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=SJYqvik/3Pi6dI1miyqZ08ohqvv4ZrpaT119P+hD1IU=; b=zS6jXKJnGF4SF1WZNwIsBGSdHnWkXd8krpz2HmqG2hstAIVP2rt3gqhO9KIvzWYuv+ +MewoGJXKHdEJc4e+bzNAtTpucCO6e6nGrAimAwCywQms8ozrCvkFcF5sB4EjXTrGeQL vxR07ZC3WlF2omccBZPIZMcqlbgwdEOGXiUNpLIwsg77eL6TtnHkwgnmbuLhiZTF8NQY DDS90s+R4jHCv60TCxSpv0ez7R26XmyynKvi/3e1QNGcmdSRY3CMX+EU6Bc0GaHXM3zA PBLC48RhleK1Ie1aK2R0XPZEZWsj6OBJEPyizGhiVZzD7YQnJwz1w1iX8gZedZkpStiX PpWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=gZYHkAGG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="ZQ/k/eGG"; 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 ca2-20020a17090af30200b00233773a522fsi200231pjb.141.2023.03.09.08.35.45; Thu, 09 Mar 2023 08:35:59 -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=gZYHkAGG; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b="ZQ/k/eGG"; 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 S232035AbjCIQEJ (ORCPT + 99 others); Thu, 9 Mar 2023 11:04:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230401AbjCIQCP (ORCPT ); Thu, 9 Mar 2023 11:02:15 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78606F7EC9; Thu, 9 Mar 2023 08:02:12 -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 2D88920181; Thu, 9 Mar 2023 16:02:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377731; 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=SJYqvik/3Pi6dI1miyqZ08ohqvv4ZrpaT119P+hD1IU=; b=gZYHkAGGCBpzucB+9DfvAz7g3V1UNyAxmXrngjZEG0L4g1gfYV7XA3QOJH5mbsOnKadlra GJUqh69NK1elgbJH/i1IBM9KQ90ZG0lYk79d5Lp0bYcoUd++JSItVK/TukQSdzNtI6t3c3 ILe/E6xdn7X/FHegdfzPAc4Jy2dxrDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377731; 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=SJYqvik/3Pi6dI1miyqZ08ohqvv4ZrpaT119P+hD1IU=; b=ZQ/k/eGGYhinigMgOYX4ZC7cDP3vEqf1mMU5WFIp+4HmVyn5ftu8J6Yw/+ordqALw4zoJa Jr1gXN4EPyi4MQBA== 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 BA9591391B; Thu, 9 Mar 2023 16:02:10 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UCGKLAIDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:10 +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 016/101] fbdev/cirrusfb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:00:36 +0100 Message-Id: <20230309160201.5163-17-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?1759908734842599845?= X-GMAIL-MSGID: =?utf-8?q?1759908734842599845?= 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/cirrusfb.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c index 85b9442031b3..a5e99a8feadd 100644 --- a/drivers/video/fbdev/cirrusfb.c +++ b/drivers/video/fbdev/cirrusfb.c @@ -35,6 +35,7 @@ */ #include +#include #include #include #include @@ -2324,17 +2325,14 @@ static struct zorro_driver cirrusfb_zorro_driver = { #endif /* CONFIG_ZORRO */ #ifndef MODULE -static int __init cirrusfb_setup(char *options) +static int __init cirrusfb_setup(const char *options) { + struct option_iter iter; char *this_opt; - if (!options || !*options) - return 0; - - 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, "noaccel")) noaccel = 1; else { @@ -2345,6 +2343,9 @@ static int __init cirrusfb_setup(char *options) mode_option = mode_option_buf; } } + + option_iter_release(&iter); + return 0; } #endif