From patchwork Mon Mar 6 15:59:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 64840 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1923251wrd; Mon, 6 Mar 2023 08:04:11 -0800 (PST) X-Google-Smtp-Source: AK7set+17INzwa76o3/UJHV6vU5QvtJGi+u/asuOqfMAZkrBkyMKLvfUX6r/Sq6FX4BSND+2yJOT X-Received: by 2002:a17:902:b193:b0:19a:a815:2876 with SMTP id s19-20020a170902b19300b0019aa8152876mr10392607plr.62.1678118650936; Mon, 06 Mar 2023 08:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678118650; cv=none; d=google.com; s=arc-20160816; b=zlA6Il68FjIOR+Y3Ay1AJy0wtK22IuPfZ8p58/J0UsKW3VPoDwPH4+asi9wdP21mDO LKiy9t4P5OSLb2KfLZEQcBczHt0o/Ywy0KF/3HOG8mThfcKvJvTuZAx+2MiL07W+k2B/ +ZKp9EbKM4ldjgW57sS6XMuWhDxQGnBRcGkxJ9YpAL2rt+B1oFOmMq827gqLGOS64K23 brv3YSgGgBksr8yzR2kgEpAvZTeAPx8MAcdjtzZSXVb6biVVL+GEFeo8Zb96uuB/Vrkl 1uFNdac3gkOVJ3NQDwlNumxhaYtV0gHtsATO3AFuA+oV4nH2X+pniFT2SS3YpmpDGwLv pL9w== 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=szSIj9mGfnEj6DDhBSYI3vEveuuHtykqw5SPVzp1w74=; b=1AZ6hs8wtLnWw0Yg8HkrLzdlibaq2g25fYEm6LAegWFx6giiKQKlPvL0bMtyV5dSa9 Xlm41BoU+zt9zq8Fby+9M42Z7AAxsbtPuKTfknz1oR48sonbSa2vDuP0HGGtR9Ijicwp lDBPAGuazUNp7ZOTYjDoTb0LUW30Y6yDJgIYTe2C2TvZ17lC3zUeNrp5dk96ZzUHGU0A 51ZaPsqSjrrmLKRFbkhYqC0FIGjDdOHdlVdVFW4lR8EhSeOfqECa8M7u09YBspkSvT+f gDlceB2Ht6nWQBg/UupEagHqK+PU0qneXVKNB9h/FmHoxzipvQA56bYALjFtuGyFr14k VMEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HVUdyJKw; 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 lf15-20020a170902fb4f00b0019afac78059si2574918plb.603.2023.03.06.08.03.57; Mon, 06 Mar 2023 08:04:10 -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=HVUdyJKw; 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 S229803AbjCFQCl (ORCPT + 99 others); Mon, 6 Mar 2023 11:02:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230052AbjCFQAj (ORCPT ); Mon, 6 Mar 2023 11:00:39 -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 24EDD26853; Mon, 6 Mar 2023 08:00:38 -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 C3B5D223D2; Mon, 6 Mar 2023 16:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118436; 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=szSIj9mGfnEj6DDhBSYI3vEveuuHtykqw5SPVzp1w74=; b=HVUdyJKw0cu6nbedGmwrMqy+SYtNj+Gaeh+x9sV5x7Zyl0M9X8vrlogM1Ey8i6J8gIRYT+ e3VfbolRpmR10UdcWcCc37ZcR6O2V/SyThnLoqFB2PKS33hSKerC43zBQKU8THJYEz7s+Y g68DTqs0NtkEjScViYka6L9A5zbMjuA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118436; 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=szSIj9mGfnEj6DDhBSYI3vEveuuHtykqw5SPVzp1w74=; b=00q1Pc/34je/Cyfz+4Bo7JXAAx+YIpUxKAuk1hjz0DxlMHkexGWiEpOvYuW1pI/v5iFZ0x H9I3LGMxVjxSwIBw== 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 5F98513513; Mon, 6 Mar 2023 16:00:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eDDEFSQOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:36 +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 33/99] fbdev/i740fb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:10 +0100 Message-Id: <20230306160016.4459-34-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?1759634942901555121?= X-GMAIL-MSGID: =?utf-8?q?1759634942901555121?= 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/i740fb.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index dd4b5c717e8e..cf45d6280f38 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c @@ -13,6 +13,7 @@ */ #include +#include #include #include #include @@ -1261,17 +1262,15 @@ static struct pci_driver i740fb_driver = { }; #ifndef MODULE -static int __init i740fb_setup(char *options) +static int __init i740fb_setup(const char *options) { - char *opt; + struct option_iter iter; + const char *opt; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while ((opt = strsep(&options, ",")) != NULL) { - if (!*opt) - continue; - else if (!strncmp(opt, "mtrr:", 5)) + while (option_iter_next(&iter, opt)) { + if (!strncmp(opt, "mtrr:", 5)) mtrr = simple_strtoul(opt + 5, NULL, 0); else { static char mode_option_buf[256]; @@ -1286,6 +1285,8 @@ static int __init i740fb_setup(char *options) } } + option_iter_release(&iter); + return 0; } #endif