From patchwork Mon Mar 6 15:59:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 660165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDE27C761A6 for ; Mon, 6 Mar 2023 16:01:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjCFQBX (ORCPT ); Mon, 6 Mar 2023 11:01:23 -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 S231180AbjCFQAs (ORCPT ); Mon, 6 Mar 2023 11:00:48 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B97E30E8A; Mon, 6 Mar 2023 08:00:46 -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 BBAAF223FC; Mon, 6 Mar 2023 16:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118444; 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=lkt2t6TbCzJeoqPND2yFcyB59V0QgGNbu9SOcmgKnwk=; b=NHhEcmv9tsTiLJnQPH2ETHxCXkscjljCidCHPH+0jJoMKrFPIlw13weJEQ/uR4kiHi1+No 7B21Wmn0iT8sijfvKnK85CFFQGL5peTP18PtRSlTBJxiQfxOyXGaiTTMQLlPREW9dNHE24 2kZd+BUHqz1lzgrPvbopotGkchivvcs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118444; 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=lkt2t6TbCzJeoqPND2yFcyB59V0QgGNbu9SOcmgKnwk=; b=qfqauMl2cTtJd+0wi1cHAGPk6rCgs4b1+BCspicy+N2lDVf+4nioAOvim68MP+hMiNqD+K bMKzDjfBg/QZouDA== 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 5EF3A13513; Mon, 6 Mar 2023 16:00:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CPVGFiwOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:44 +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 53/99] fbdev/ocfb: Parse option string with struct option_iter Date: Mon, 6 Mar 2023 16:59:30 +0100 Message-Id: <20230306160016.4459-54-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 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org 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/ocfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c index 34684191f2f0..546230483f53 100644 --- a/drivers/video/fbdev/ocfb.c +++ b/drivers/video/fbdev/ocfb.c @@ -8,6 +8,7 @@ * kind, whether express or implied. */ +#include #include #include #include @@ -67,20 +68,17 @@ struct ocfb_dev { }; #ifndef MODULE -static int __init ocfb_setup(char *options) +static int __init ocfb_setup(const char *options) { - char *curr_opt; + struct option_iter iter; + const char *curr_opt; - if (!options || !*options) - return 0; + option_iter_init(&iter, options); - while ((curr_opt = strsep(&options, ",")) != NULL) { + while (option_iter_next(&iter, curr_opt)) { static char mode_option_buf[256]; int ret; - if (!*curr_opt) - continue; - ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", curr_opt); if (WARN(ret < 0, "ocfb: ignoring invalid option, ret=%d\n", ret)) continue; @@ -89,6 +87,8 @@ static int __init ocfb_setup(char *options) mode_option = mode_option_buf; } + option_iter_release(&iter); + return 0; } #endif