From patchwork Thu Jan 6 05:58:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zong Li X-Patchwork-Id: 12705141 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8C390C433EF for ; Thu, 6 Jan 2022 05:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=nFuzxri6YL5mBDuHDj95sE189bEJN2ENIMM1T2x39DI=; b=Xa8u2cRemDlzTa N5p+FJhzT48DGnaFydwcrHPn1cShFm7iiDs6JsNqyqy/vg4hYGHwKBFKEWDEoA96FU304PkP80p8T 4t5R6KBvOlPl5D/9L8QQUg6N/tklaNgVDPU0MQKX3jugQgJO2EznANzrGQIzAscuAdLoGkWX2oELC wPzBcq1md6YLmh3xg6HtmZCgs5uWM2Juej90NGyIZAfXOpebKWKHPTrXkVot2cqSU6RTfznt5A1VZ jd5yGrjs6xjQRrQRrc7Me+Lt6/sLeGF4SfG7wtZ1lMM6MihEwrq2ZYZlvyfPcCT0WZDjqglmwL2KD kUO+L6XYnCZYDIx8Zn6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5LnK-00GiSx-Md; Thu, 06 Jan 2022 05:58:38 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5LnH-00GiSV-3E for linux-riscv@lists.infradead.org; Thu, 06 Jan 2022 05:58:36 +0000 Received: by mail-pg1-x530.google.com with SMTP id g2so1684969pgo.9 for ; Wed, 05 Jan 2022 21:58:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xy0s/bG/77IbnsCl2jphUEvh5EOackYvRNc3QDAL5KM=; b=NhJPi0DCjwL/dLd6c3uV6nb4llPRlrfUg1seAGOwr3gDRbaYUxWaz5JTpAa4KLIHv1 Bjq3l5l7YWu3AYxuSL8Sd7iZOXyEf3Gy8iPm/IMm/ORYYDfhsHGXl+gI3DICg2qCgh/m VquvH91wwhdnM8uMjkaylgJk1ldKcrWSyvfWj9Rxt4YDZtNPjc2tAVFnLadhB5hnU5hx R6T4EqMw1zcfF4rLOdbUxmthD+2u68xv4kboCc8dasFZGZcOR9gnf3FyVooaVyXyy8dt AxmPquuivGozjA83O+QANvBL/PN9wvmWQnzivjR/Px+waIaydAtbEKR0djWrrdhlb95l bztg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xy0s/bG/77IbnsCl2jphUEvh5EOackYvRNc3QDAL5KM=; b=qx7vAVSrPD6FVcIoCSESHr5y1iQ5qxrM0I1GW8dfom/egvVD8BN7grwyin3A30kfGI 4n+i0oPzQeq+nyDxH4ZhaoJJ8DE8FGP8vz98vrUZ5RgR4b+e+Dl0mRf2s6J+vQ1NvRz9 DUSBAwCZyG0ngtS3sbmfyEpBjszr7PeTjAGbTS+glvS4rA0lNvdApaBscXiyrlMTeP29 VeQcBTDTDJPlwEvkK+sd63JXgd6PbnDlrP4vdq0w0+3D/Q72TMvoBOe8+6XXGzSYwtvs 2hp5wYXdHf9w3hN7mWUdcicKFMG61XOz0cGPlYJ033HABlXJxrW0beHhyLCgwTnU4QwB b9/w== X-Gm-Message-State: AOAM531Bj1FfBRL78kWeJBfDvs1ncNhYkpU7ukFCCHI+Fi1XAqpnd39Y OlrJc8WvbDCP3wXKaHwFfpWeOQ== X-Google-Smtp-Source: ABdhPJxDgNBnwLi1RBsJAamw0N6o2z+OUH1X+EQxGH3qrv36V5IS5y0dhPMBDfFOq8oSozQWgdryMg== X-Received: by 2002:a63:750b:: with SMTP id q11mr35999917pgc.349.1641448713496; Wed, 05 Jan 2022 21:58:33 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id j4sm980840pfj.34.2022.01.05.21.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 21:58:32 -0800 (PST) From: Zong Li To: mturquette@baylibre.com, sboyd@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, lee.jones@linaro.org, linux-clk@vger.kernel.org, linux-riscv@lists.infradead.org Cc: Zong Li Subject: [PATCH v3] clk: sifive: Fix W=1 kernel build warning Date: Thu, 6 Jan 2022 13:58:28 +0800 Message-Id: X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220105_215835_231871_C1CFAB07 X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This commit reverts commit 487dc7bb6a0c ("clk: sifive: fu540-prci: Declare static const variable 'prci_clk_fu540' where it's used"). For fixing W=1 kernel build warning(s) about ‘prci_clk_fu540’ defined but not used [-Wunused-const-variable=], the problem is that the C file of fu540 and fu740 doesn't use these variables, but they includes the header files. We could refine the code by moving the definition of these variables into fu540 and fu740 implementation respectively instead of common core code, then we could still separate the SoCs-dependent data in their own implementation. Changed in v3: - Rebase on v5.16-rc8 - Add fixes tag Changed in v2: - Move definition of variable to C file from header Signed-off-by: Zong Li --- drivers/clk/sifive/fu540-prci.c | 6 +++++- drivers/clk/sifive/fu540-prci.h | 6 +----- drivers/clk/sifive/fu740-prci.c | 6 +++++- drivers/clk/sifive/fu740-prci.h | 11 +---------- drivers/clk/sifive/sifive-prci.c | 5 ----- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/clk/sifive/fu540-prci.c b/drivers/clk/sifive/fu540-prci.c index 29bab915003c..5568bc26e36f 100644 --- a/drivers/clk/sifive/fu540-prci.c +++ b/drivers/clk/sifive/fu540-prci.c @@ -20,7 +20,6 @@ #include -#include "fu540-prci.h" #include "sifive-prci.h" /* PRCI integration data for each WRPLL instance */ @@ -87,3 +86,8 @@ struct __prci_clock __prci_init_clocks_fu540[] = { .ops = &sifive_fu540_prci_tlclksel_clk_ops, }, }; + +struct prci_clk_desc prci_clk_fu540 = { + .clks = __prci_init_clocks_fu540, + .num_clks = ARRAY_SIZE(__prci_init_clocks_fu540), +}; diff --git a/drivers/clk/sifive/fu540-prci.h b/drivers/clk/sifive/fu540-prci.h index c220677dc010..931d6cad8c1c 100644 --- a/drivers/clk/sifive/fu540-prci.h +++ b/drivers/clk/sifive/fu540-prci.h @@ -7,10 +7,6 @@ #ifndef __SIFIVE_CLK_FU540_PRCI_H #define __SIFIVE_CLK_FU540_PRCI_H -#include "sifive-prci.h" - -#define NUM_CLOCK_FU540 4 - -extern struct __prci_clock __prci_init_clocks_fu540[NUM_CLOCK_FU540]; +extern struct prci_clk_desc prci_clk_fu540; #endif /* __SIFIVE_CLK_FU540_PRCI_H */ diff --git a/drivers/clk/sifive/fu740-prci.c b/drivers/clk/sifive/fu740-prci.c index 53f6e00a03b9..0ade3dcd24ed 100644 --- a/drivers/clk/sifive/fu740-prci.c +++ b/drivers/clk/sifive/fu740-prci.c @@ -8,7 +8,6 @@ #include -#include "fu540-prci.h" #include "sifive-prci.h" /* PRCI integration data for each WRPLL instance */ @@ -132,3 +131,8 @@ struct __prci_clock __prci_init_clocks_fu740[] = { .ops = &sifive_fu740_prci_pcie_aux_clk_ops, }, }; + +struct prci_clk_desc prci_clk_fu740 = { + .clks = __prci_init_clocks_fu740, + .num_clks = ARRAY_SIZE(__prci_init_clocks_fu740), +}; diff --git a/drivers/clk/sifive/fu740-prci.h b/drivers/clk/sifive/fu740-prci.h index 511a0bf7ba2b..5bc0e18f058c 100644 --- a/drivers/clk/sifive/fu740-prci.h +++ b/drivers/clk/sifive/fu740-prci.h @@ -7,15 +7,6 @@ #ifndef __SIFIVE_CLK_FU740_PRCI_H #define __SIFIVE_CLK_FU740_PRCI_H -#include "sifive-prci.h" - -#define NUM_CLOCK_FU740 9 - -extern struct __prci_clock __prci_init_clocks_fu740[NUM_CLOCK_FU740]; - -static const struct prci_clk_desc prci_clk_fu740 = { - .clks = __prci_init_clocks_fu740, - .num_clks = ARRAY_SIZE(__prci_init_clocks_fu740), -}; +extern struct prci_clk_desc prci_clk_fu740; #endif /* __SIFIVE_CLK_FU740_PRCI_H */ diff --git a/drivers/clk/sifive/sifive-prci.c b/drivers/clk/sifive/sifive-prci.c index 80a288c59e56..916d2fc28b9c 100644 --- a/drivers/clk/sifive/sifive-prci.c +++ b/drivers/clk/sifive/sifive-prci.c @@ -12,11 +12,6 @@ #include "fu540-prci.h" #include "fu740-prci.h" -static const struct prci_clk_desc prci_clk_fu540 = { - .clks = __prci_init_clocks_fu540, - .num_clks = ARRAY_SIZE(__prci_init_clocks_fu540), -}; - /* * Private functions */