[PATCH] mbox: qcom: avoid unused-variable warning

From: Arnd Bergmann
Date: Fri Sep 20 2019 - 10:55:51 EST


Without CONFIG_OF, there is no reference to the apcs_clk_match_table[]
array, causing a harmless warning:

drivers/mailbox/qcom-apcs-ipc-mailbox.c:57:28: error: unused variable 'apcs_clk_match_table' [-Werror,-Wunused-variable]
const struct of_device_id apcs_clk_match_table[] = {

Move the variable out of the variable scope and mark it 'static'
to avoid the warning (static const variables get silently dropped
by the compiler), and avoid the on-stack copy at the same time.

Fixes: 78c86458a440 ("mbox: qcom: add APCS child device for QCS404")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
drivers/mailbox/qcom-apcs-ipc-mailbox.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index eeebafd546e5..10557a950c2d 100644
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -45,6 +45,12 @@ static const struct mbox_chan_ops qcom_apcs_ipc_ops = {
.send_data = qcom_apcs_ipc_send_data,
};

+static const struct of_device_id apcs_clk_match_table[] = {
+ { .compatible = "qcom,msm8916-apcs-kpss-global", },
+ { .compatible = "qcom,qcs404-apcs-apps-global", },
+ {}
+};
+
static int qcom_apcs_ipc_probe(struct platform_device *pdev)
{
struct qcom_apcs_ipc *apcs;
@@ -54,11 +60,6 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev)
void __iomem *base;
unsigned long i;
int ret;
- const struct of_device_id apcs_clk_match_table[] = {
- { .compatible = "qcom,msm8916-apcs-kpss-global", },
- { .compatible = "qcom,qcs404-apcs-apps-global", },
- {}
- };

apcs = devm_kzalloc(&pdev->dev, sizeof(*apcs), GFP_KERNEL);
if (!apcs)
--
2.20.0