From patchwork Mon Mar 6 16:00:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1934782wrd; Mon, 6 Mar 2023 08:23:01 -0800 (PST) X-Google-Smtp-Source: AK7set/cKuFMz1fDZB9zoq+bopkbiJE8YCYgPWbbfq+BKRBKPv3SBmRZQd9kI3oZ0tJlzxd9y1Tn X-Received: by 2002:a17:903:187:b0:19d:16fa:ba48 with SMTP id z7-20020a170903018700b0019d16faba48mr13923860plg.28.1678119780838; Mon, 06 Mar 2023 08:23:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678119780; cv=none; d=google.com; s=arc-20160816; b=Ug8Q8M3k2E7oP78TPTc+j19HwYzVNItOV+5/HiZyhUVCnyl/Yw6/19mwEj7v3nOhi/ yAHmcFs5uiT6GjhE/sfhVNTrR7GYLVvm5c+1070roQcQNIH1sEI7iKdm8tF0A/G0xWdn Rs6iKhZ5TSvVDXRBbj6LQbZX/1FxNodLhaxvbhm9XoLVlXF5lY92696jKZIfNL8p7dlN TQI9RzW2phi9rZvhwNmatjEGon9DFFZ38YAnyM0S8wsDcIY1Z9nGCFoXGXIA70zCk87g +f+mK79GP4P3gTjJII+oFSrDomMtyUVFm54FwPjBRPwkZ5Sx5IRVfD5q4/hZa6U7Mw2m vZoQ== 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=yHX8se/a6g2QABvUAuzQQZnhm45LSCTjkT4aQxcZgwg=; b=MytlkxMv43uTJ6BcKdohVDypSVySjF1SLVeNH57kB2+bFShVOmGbAJ5w+UV1DLkfur p/HNs/JS9yZMLjvjV4aQS5VKsVBWRhoIaY58WpFFY13VI1uY5RjUzdhFfJPaL0Z3RLWB Dv8G7UJsaTTfV88VC+ZdbgTmIEPDetaeRMRVy2Xd5FDHxMkGVOSleWSuFoToFsgTd0V3 pYTeLzy+c9DVQpGG3yECyBckidnZ0V5DWhTVcmiGJdIHVtDYIUcm2Lk6eBj4/haycVsN RF0EY/KsivZA7W9gWtuSBuvWjAAzNQF3rzBW43jS5OvVUwF8Uh3wg/2otkvIJFWn7yr4 CTGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=IO1wQ7s6; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 v11-20020a63464b000000b005033552517bsi8585083pgk.281.2023.03.06.08.22.48; Mon, 06 Mar 2023 08:23:00 -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=IO1wQ7s6; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 S231626AbjCFQGn (ORCPT + 99 others); Mon, 6 Mar 2023 11:06:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231529AbjCFQBJ (ORCPT ); Mon, 6 Mar 2023 11:01:09 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2D922FCF8; Mon, 6 Mar 2023 08:01:02 -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 5B49A22460; Mon, 6 Mar 2023 16:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118461; 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=yHX8se/a6g2QABvUAuzQQZnhm45LSCTjkT4aQxcZgwg=; b=IO1wQ7s6J51f7IGHE42mtkVSBcrzo6+KDsNJYhUTEDsyqxrZEPNsl1OP+jCGGj3EzzLUc3 XyZR1rytImeAn4HIA6EfC9OINCWP9QPc6im9N8cCCm5J+jKeUaudbAy6dytj0iJpF/O6h6 J4xTsMUmBJpZCWu2hkOE+CTLQlQrasM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118461; 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=yHX8se/a6g2QABvUAuzQQZnhm45LSCTjkT4aQxcZgwg=; b=jRT7I0wvGwJFHKoOvaHLkubbf/RB6iKsyZiAqxFyXlE35ZE2Q3265uqsjCZrEKXO9uvqzg yjBObXwHcb/0KEDA== 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 EF81513513; Mon, 6 Mar 2023 16:01:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uDFuOTwOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:01:00 +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 95/99] fbdev/vfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 17:00:12 +0100 Message-Id: <20230306160016.4459-96-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?1759636127174270622?= X-GMAIL-MSGID: =?utf-8?q?1759636127174270622?= 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/vfb.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c index 15a6a0896ab5..ef22a6815e70 100644 --- a/drivers/video/fbdev/vfb.c +++ b/drivers/video/fbdev/vfb.c @@ -10,6 +10,7 @@ * more details. */ +#include #include #include #include @@ -392,9 +393,10 @@ static int vfb_mmap(struct fb_info *info, * The virtual framebuffer driver is only enabled if explicitly * requested by passing 'video=vfb:' (or any actual options). */ -static int __init vfb_setup(char *options) +static int __init vfb_setup(const char *options) { - char *this_opt; + struct option_iter iter; + const char *this_opt; vfb_enable = 0; @@ -403,12 +405,9 @@ static int __init vfb_setup(char *options) vfb_enable = 1; - if (!*options) - return 1; + option_iter_init(&iter, options); - while ((this_opt = strsep(&options, ",")) != NULL) { - if (!*this_opt) - continue; + while (option_iter_next(&iter, this_opt)) { /* Test disable for backwards compatibility */ if (!strcmp(this_opt, "disable")) vfb_enable = 0; @@ -424,6 +423,9 @@ static int __init vfb_setup(char *options) mode_option = mode_option_buf; } } + + option_iter_release(&iter); + return 1; } #endif /* MODULE */