From patchwork Thu Mar 9 16:01:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 66986 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp388242wrd; Thu, 9 Mar 2023 08:32:37 -0800 (PST) X-Google-Smtp-Source: AK7set/zSrlw2JTk40SafSaZdTn3+b+qBLYxuSpGR3TGAv1h/2kg/+fwzc8Anh4OnwmDaE0LvZ+v X-Received: by 2002:a05:6a20:1b01:b0:cc:3bf0:ed94 with SMTP id ch1-20020a056a201b0100b000cc3bf0ed94mr18739302pzb.20.1678379557445; Thu, 09 Mar 2023 08:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678379557; cv=none; d=google.com; s=arc-20160816; b=siscUZ6HlX/7Zts/1ShuRRcCVHYtSqa1w+ycffzGYaVq3PvTJSbJOKxyZHKHI8boc9 RkktHYo6j5yeBq5gdn50L9uqo4IeK6hPtRYRkWAZl1E+zSfR1vrzAfmWDdptB2KfWRsd y7d/OsTnjmKPKRgSTNi68agO5/M9j7W0zfGKjG2znvfINTXhxDXK3CmGAgDyCf/xALoW /U26+tyTlVzzB1X1ofF3x85bcFNux5ZHSFMPWEZmYE8n6ICvDKbCRcJFdUuLdHukIgna d5NOH9VRFjWUlKk1jkwhT/SaGBrhpg2lFxM37TtuLQSKDzaxOVSPAXD19bsTZb4BAS1M ElDQ== 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=LrR4dEV8fvot4krXRpemBNzsGqKxI9Iidiw4W2qbfcs=; b=YzLs4jvj1qDYWba17Axy56Lg4oxLiL96Fe3KiVDsDuPGwI6RsResQO0OhdKjbquoh7 7aPV0quwmqAjFD4RweFh5+eIzSFqgbF1q0gVqTs5ubNzd5qLL1yGBlF0uT89B9x1dA7F HvjA0hV2fbmUJ4bG9lio32fDtPqoyyPnVOHwROlawJE/hhoxnpCsUjnXbUJjC944u/0W y8YCdMky3JClAZIJcgqzlU42fnCo2zDIkBIePQmiAeyZPyj3eZlMJ6GBkJMhVeulQQ5M wEYwzsJLlPRvv9grI3Q5iiRqarPTn9mgPZBDMmocUT9UlOVi9rCmUW7nzOnfslO9zhVt v30w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ae6f8RbI; 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 l9-20020a635709000000b00502f89f0d8dsi17888580pgb.167.2023.03.09.08.32.21; Thu, 09 Mar 2023 08:32:37 -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=ae6f8RbI; 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 S229549AbjCIQJ2 (ORCPT + 99 others); Thu, 9 Mar 2023 11:09:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbjCIQCf (ORCPT ); Thu, 9 Mar 2023 11:02:35 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44C8CF3670; Thu, 9 Mar 2023 08:02:34 -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 02C5C22162; Thu, 9 Mar 2023 16:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678377753; 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=LrR4dEV8fvot4krXRpemBNzsGqKxI9Iidiw4W2qbfcs=; b=ae6f8RbIy2Rv+yRmon5XxI4seRFmyMdyJOQsgGV+2HydP0zUWHk7HHsifkPYnKLIYZC9/0 Pyxr7sE69YfCOtNMuW3hi9Kxe8uBAQBHdNECFnYgbyAyaTHteLKJSALCLE/vVCHZC517Wj PdaCKJVkqobG0szMc/ZRUj2X4u7Abhg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678377753; 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=LrR4dEV8fvot4krXRpemBNzsGqKxI9Iidiw4W2qbfcs=; b=QECZeFxqwtZvMCizXWX7OraDZ3sytS0NpgbSyW9YFP6OWcxicrmEQvBtHYvmh8ZO7P+JLl zZg/1Cbxo1k/GfDA== 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 985B61391B; Thu, 9 Mar 2023 16:02:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KIZQJBgDCmQHbgAAMHmgww (envelope-from ); Thu, 09 Mar 2023 16:02:32 +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 071/101] fbdev/savagefb: Parse option string with struct option_iter Date: Thu, 9 Mar 2023 17:01:31 +0100 Message-Id: <20230309160201.5163-72-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?1759908523179350191?= X-GMAIL-MSGID: =?utf-8?q?1759908523179350191?= 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/savage/savagefb_driver.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c index 0ca5894114c9..4650688fd23c 100644 --- a/drivers/video/fbdev/savage/savagefb_driver.c +++ b/drivers/video/fbdev/savage/savagefb_driver.c @@ -42,6 +42,7 @@ */ #include +#include #include #include #include @@ -2537,19 +2538,22 @@ static void __exit savage_done(void) /* ************************* init in-kernel code ************************** */ -static int __init savagefb_setup(char *options) +static int __init savagefb_setup(const char *options) { #ifndef MODULE + 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)) { kfree(mode_option_buf); mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors mode_option = mode_option_buf; } + + option_iter_release(&iter); + #endif /* !MODULE */ return 0; }