From patchwork Mon Mar 6 15:59:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64850 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1923718wrd; Mon, 6 Mar 2023 08:04:45 -0800 (PST) X-Google-Smtp-Source: AK7set9qAKKy+GSfEVQ/ZtF3muBkwA3CMvXHBYCF4UfD4K+qGZtFYbXJI7zKjpC2IIUQ0bdjUmkI X-Received: by 2002:a17:90b:33c3:b0:237:b92f:39d1 with SMTP id lk3-20020a17090b33c300b00237b92f39d1mr12130637pjb.0.1678118685625; Mon, 06 Mar 2023 08:04:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118685; cv=none; d=google.com; s=arc-20160816; b=UgaVfsQ210CT7PUeNwvw93MYiw75g6R2octMdgfIBCMx2XXTcGdnksW7t+aprruSK3 w8H1iflAyCvcVTd7K2/QZlYfvh2GPkAfI1nthMOq5iyBzEzN6XikWXhjzYP3NaLK/n6G UDIG0ujL1EBqAfPIq2op2MDnA8JkQa43gzAknt4AXc0aRXTz27QJIZ4SaibqkgHn/lre cfuxErA9J9V9vGs85ebCKgvYLF+F/gpzReYiuXOHuu3z7Ix7/IoAJT3wk93oyQZPnLRq ZdxJ4WKPjdoX85+bboRIHu7X8DfyBK2ixx/EzpVpbVo2pfOZo0GNUsFXOB2zTDd9fM6X 2yOg== 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=zGLBLBg3pdJVJ0Ef7zMg0fUWatn8Nn9plsu006L4xGY=; b=JRNJwVUG76HeuyDzAe5jdGjzTKHCjszPG1ICytb9I+UIFcuZOuYTOIBQB2EGCPemHS 0d9zYwKqHi4xgowNB29ZP0B9eOF6cYaWIRXtfXfdpF+v2bW9VSj1F8Y4GWNQJCHb3q4r 7jJyNCKdXVPK3AWcqXTG132M7/3O4a5qVXalUtaDvGQw0hoK9cCuLT3Sg98l3Uhv7iSw 4cLT2JBZLSMck2v07iNqCyqRAKHZ0r2tFJMZCWYSEXU5ket1//gLFP//Mp0TzrRewllq xEQsmxbwAW1/6LdJoomcKei5kzGmbDbfJNgNByjshi0gWiKoZG8xHEXYEdwXkDXy/M25 e59g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=rGbS6q1d; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=tImxUNXW; 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 ce4-20020a17090aff0400b0022c9594aaf4si9273666pjb.184.2023.03.06.08.04.32; Mon, 06 Mar 2023 08:04:45 -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=rGbS6q1d; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=tImxUNXW; 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 S231382AbjCFQDf (ORCPT + 99 others); Mon, 6 Mar 2023 11:03:35 -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 S230215AbjCFQAp (ORCPT ); Mon, 6 Mar 2023 11:00:45 -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 B5FCF34F7E; Mon, 6 Mar 2023 08:00:42 -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 338261FE82; Mon, 6 Mar 2023 16:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118441; 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=zGLBLBg3pdJVJ0Ef7zMg0fUWatn8Nn9plsu006L4xGY=; b=rGbS6q1dbhX3Pk7dNvUjpg8lilOZjgiJHNpUw5nxdDRrKvdHY+/1hEn/lLOTcJ6k5cF4v2 1QgMMBPb3bfiOLBqVpLPk9Ln3fenHy2+Vcv9IcDgd0730zb6rUqU5gQRsbWMoKq+Anxajh gig1RRPHv+C7TEa8m2U4BfSYTfIPZzw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118441; 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=zGLBLBg3pdJVJ0Ef7zMg0fUWatn8Nn9plsu006L4xGY=; b=tImxUNXWmu7wTyC7umHvV5pt6XrboNN+O93DgzWYN/JyZLxSNY1wixlU1hhBMVcr+jm1/R 8Jg2dPER5jD8+MDw== 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 CD79113A6A; Mon, 6 Mar 2023 16:00:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CDtAMSgOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:40 +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 44/99] fbdev/macfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:21 +0100 Message-Id: <20230306160016.4459-45-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?1759634978556042415?= X-GMAIL-MSGID: =?utf-8?q?1759634978556042415?= 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/macfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/macfb.c b/drivers/video/fbdev/macfb.c index 44ff860a3f37..a72edb98b170 100644 --- a/drivers/video/fbdev/macfb.c +++ b/drivers/video/fbdev/macfb.c @@ -20,6 +20,7 @@ * http://rajsky.psych.nyu.edu/Tips/VideoBugs.html */ +#include #include #include #include @@ -504,23 +505,22 @@ static const struct fb_ops macfb_ops = { .fb_imageblit = cfb_imageblit, }; -static void __init macfb_setup(char *options) +static void __init macfb_setup(const char *options) { - char *this_opt; + struct option_iter iter; + const char *this_opt; - if (!options || !*options) - return; - - 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, "inverse")) fb_invert_cmaps(); else if (!strcmp(this_opt, "vidtest")) vidtest = 1; /* enable experimental CLUT code */ } + + option_iter_release(&iter); } static void __init iounmap_macfb(void)