From patchwork Sun Dec 17 19:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 180060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp858594dyi; Sun, 17 Dec 2023 11:32:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEvGhHLcLq2aYYY/FhUKtHozhVKLBVO2iOefZWHsn7amauvMGxLIhOIC4PW6Cw4jYl0WVUa X-Received: by 2002:a05:6808:3193:b0:3ba:34d:85f3 with SMTP id cd19-20020a056808319300b003ba034d85f3mr15895656oib.72.1702841559242; Sun, 17 Dec 2023 11:32:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702841559; cv=none; d=google.com; s=arc-20160816; b=eNMQqRPv09Hb8TBrtRbdV5sCGSoCWfme8QBXtWVe6co7OcnNMJ5DnpeEwepeVodubx xOUjg2DNqP+mKonHX3Q+jX4TXhrK/U71h0Bzi+1nnmqghhXeO1D0wG2URby0SExgdIPL V9N0uMs6vpXCwTnStabC1njfls8BZypeMQzuNuAhEZF/KuIrIzB4rZ9+/xFa265F+Sj1 YcSIYHFpfrcE5eo3S6GXkCAAY8QBgcwzRm+MOanhE4vpkFdT2U7MHWbko/yRW622LCtm EXWEWVoxeW9NNYe1XTkAj05KGvhZ8EMgNS+2nLdqWKDSNJ12jaG1LYucprv4eEu01N40 wCSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=BG5QOERLW5M4aNn630eRtDtXQsKO+0lmGJ6LcnUQd/8=; fh=lndhqhM/smUv/sqG9l62mCR6taeFpgcLIT7VIeds5fc=; b=ezT492UzQtKp52Qb1j4EfoHnOLyDB+Rm57r+Vh142K+qiAgglCFVeYpVGjONDHETWQ QJr7lLf2VN7ZFPaDzEwsCak4UR2jAagdigit8vKwyesO7ZhMf3E2pT1N2u8bDUx4tUIE sd+hGVbGskR5NeirhhiCTdpxLHjsR6b9GsRV8IoEK3aKOyt5+Y+ibmhXNnPGcEI7wnPI xbpEAR1zOi86mn0PVLKtJ8RGamn8uQhPnZlVggcqhiEUyyckNqegI8KfpJ8G3GMQJk79 YhEMQ1Wc6+PCQhmtsbHFNitPvItwHL/dU2vqwi2hoax2gIJyZs+eJ+bJulUi4PkZjxDx mIBQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-2783-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2783-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id m63-20020a632642000000b005c5e2488c32si2657493pgm.405.2023.12.17.11.32.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 11:32:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2783-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-2783-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2783-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B014C282D63 for ; Sun, 17 Dec 2023 19:32:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 23EFD495CF; Sun, 17 Dec 2023 19:32:00 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16F7B481AA for ; Sun, 17 Dec 2023 19:31:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rEwrg-0007Ge-RU; Sun, 17 Dec 2023 20:31:52 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rEwrg-00GXTk-9S; Sun, 17 Dec 2023 20:31:52 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rEwrg-004ow4-0B; Sun, 17 Dec 2023 20:31:52 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Santosh Shilimkar , Krzysztof Kozlowski Cc: kernel@pengutronix.de, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] memory: emif: Simplify code handling CONFIG_DEBUG_FS Date: Sun, 17 Dec 2023 20:31:31 +0100 Message-ID: <2c7dd66d4a101b74b16e7e1839e30f3c88510c33.1702829744.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2299; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=cNuwKEMd45aqzupPi2qb5vZR8pJEhJctqL+QHzyhSEI=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlf0yWF5TzdWoQllzg7+AC3DhtgKGmIgXjLgmM2 nhM6Lyqop2JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZX9MlgAKCRCPgPtYfRL+ TnL/CACL53V7d3OibbYPPfpyRIZAN/rX79i1zHBITtLob3jyamjbQGQsed30mABSa9VnIaUJS7j ne4+gx7tcKMm26iiEpRPRa26zpgYdbk5rKMuuELqVlX0dBCOrZJn3tvC49m28hOr8BhlWnA5yMa EUl4kblSnepsLENREKrwRn2qjJPbuuwVe1i+xD6DVFQKhuOKlfEq1t2Z0lhNcqAsMwmrZUVDJzP KVCTVBwPYKK0TgKD7/GOPB6lfb60rdGwi/+E9Ur5euJnPRMFYBoEp4RE5dIAvFTk7cZHs39YsaR 7U6CMcIk9uQbqtvF0u4eg3KseftHaYvqRzvIiF3WWRnY4XXD X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785558790790558245 X-GMAIL-MSGID: 1785558790790558245 Instead of using #ifdef make use of IS_ENABLED(). According to bloat-o-meter this patch doesn't change code sizes with CONFIG_DEBUG_FS=n. Also change emif_debugfs_init() to return void. The only caller doesn't check the return value anyhow. Signed-off-by: Uwe Kleine-König --- drivers/memory/emif.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index f305643209f0..dd1d87f8fdc8 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -72,7 +72,6 @@ static DEFINE_SPINLOCK(emif_lock); static unsigned long irq_state; static LIST_HEAD(device_list); -#ifdef CONFIG_DEBUG_FS static void do_emif_regdump_show(struct seq_file *s, struct emif_data *emif, struct emif_regs *regs) { @@ -140,31 +139,24 @@ static int emif_mr4_show(struct seq_file *s, void *unused) DEFINE_SHOW_ATTRIBUTE(emif_mr4); -static int __init_or_module emif_debugfs_init(struct emif_data *emif) +static void __init_or_module emif_debugfs_init(struct emif_data *emif) { - emif->debugfs_root = debugfs_create_dir(dev_name(emif->dev), NULL); - debugfs_create_file("regcache_dump", S_IRUGO, emif->debugfs_root, emif, - &emif_regdump_fops); - debugfs_create_file("mr4", S_IRUGO, emif->debugfs_root, emif, - &emif_mr4_fops); - return 0; + if (IS_ENABLED(CONFIG_DEBUG_FS)) { + emif->debugfs_root = debugfs_create_dir(dev_name(emif->dev), NULL); + debugfs_create_file("regcache_dump", S_IRUGO, emif->debugfs_root, emif, + &emif_regdump_fops); + debugfs_create_file("mr4", S_IRUGO, emif->debugfs_root, emif, + &emif_mr4_fops); + } } static void __exit emif_debugfs_exit(struct emif_data *emif) { - debugfs_remove_recursive(emif->debugfs_root); - emif->debugfs_root = NULL; + if (IS_ENABLED(CONFIG_DEBUG_FS)) { + debugfs_remove_recursive(emif->debugfs_root); + emif->debugfs_root = NULL; + } } -#else -static inline int __init_or_module emif_debugfs_init(struct emif_data *emif) -{ - return 0; -} - -static inline void __exit emif_debugfs_exit(struct emif_data *emif) -{ -} -#endif /* * Get bus width used by EMIF. Note that this may be different from the