From patchwork Fri May 5 19:46:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98682 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292759qge; Fri, 5 May 2017 12:48:30 -0700 (PDT) X-Received: by 10.84.247.9 with SMTP id n9mr65810881pll.119.1494013710219; Fri, 05 May 2017 12:48:30 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.30; Fri, 05 May 2017 12:48:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbdEETs2 (ORCPT + 6 others); Fri, 5 May 2017 15:48:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53476 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754324AbdEETsY (ORCPT ); Fri, 5 May 2017 15:48:24 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MFljh-1dJ7GL2cZp-00Eg4e; Fri, 05 May 2017 21:48:12 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Rob Herring , Mike Turquette , Arnd Bergmann Subject: [PATCH 3.16-stable 25/87] clk/efm32gg: fix dt init prototype Date: Fri, 5 May 2017 21:46:43 +0200 Message-Id: <20170505194745.3627137-26-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:s6I1RMKtHvF1AAGySVkJVGDHw/xpOE5t/oFqe6FTTvbV4GtMgbE uCm4XU4GPE3A6OrChRyO076lJpw+xRXbVdatBtfDmoEupsXMU9EWsWBYcrLDjtiAQP/3EaN wc73JWA8biCBdFUuuDoCOZ67uVTNN+1SaFg00SCJZWU0w6lkMIrg1WpNWu8SQIgrs8O34kq oI4551heYvf0f0WotAEXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5d9OMihyWg0=:fD1UPbdkmXMTIQvCxnMcFJ 22uZq+IKgZweaSQhshSyiCjHDPhnm3CUgvvPetHV1DwpJJTZrV0+LX+ziH0KJQeNnsUfqhimY BUEbr/109HQzz41yPzCfz1JSnNaFeuM/TuSPb9XR8zRAU2PY2qktdxRgm1znAzAcie//itVzx Wsfw2nzCBmqmTAEKD10qVcexmFSVcmXTxhhDeXQHSeD62pcl9cxvmfRawN8jLN26xmENcknQ1 9dSj5l0oLvRsA7xAt0Zg/AqX2D2vW65nW4Q3NRahKYF2X9TIFWxMujaE05g5OXIE+PKKX+6eB 4GaMlsb9QQ+MyJEPNWP7HOXKD5T6G8ex6jk4NqN0fS9ozr0z7bruMnogZtNX/eYp3SMiePy79 Qsz3oD5AcBeJJ/ATPgssPGPaC4oESgC0+rXU3XOcRYx40sdLOQVz1B0HukoaHuydbfJWqOfRt z4q5Ge7Xe4eX0VqxTqnFZNHnF/wsukMNCLCw0wKExh2ORa1R/JgmNaaK+I+EWC6XGoiGGcDKb mBCPA8rds8fEggx+PfBA2SjCPqH4ENNTPDZFr/h1/cmDh9TRjWijvQUNrC63QgGUr4Kny1GqN 4s22W8QrJWRTWgZjg5UJtitEfIY+423ZJ0wWT/wAMrhWOmn3i09iEXjJuxbY9QQLG1B7VUZED tAZhasMQL0TpigkfQt53dJEdB9ecKxw1yDqFBJ9f7M7f/K5RhQay4MlxQe3T69302U1v7DEZz /RobDyoxNhJ7i5Hh Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Uwe Kleine-König Commit 34bac750ed6f7a87fe6ea0f1d7b000391ae08698 upstream. Since commit 54196ccbe0ba (of: consolidate linker section OF match table declarations) which went into 3.16-rc1 the following compiler warning is generated: In file included from drivers/clk/clk-efm32gg.c:12:0: include/linux/of.h:772:20: warning: comparison of distinct pointer types lacks a cast [enabled by default] .data = (fn == (fn_type)NULL) ? fn : fn } ^ include/linux/of.h:785:3: note: in expansion of macro '_OF_DECLARE' _OF_DECLARE(table, name, compat, fn, of_init_fn_1) ^ include/linux/clk-provider.h:545:42: note: in expansion of macro 'OF_DECLARE_1' #define CLK_OF_DECLARE(name, compat, fn) OF_DECLARE_1(clk, name, compat, fn) ^ drivers/clk/clk-efm32gg.c:81:1: note: in expansion of macro 'CLK_OF_DECLARE' CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init); ^ Fix it by making efm32gg_cmu_init return void. Cc: Rob Herring Reported-by: Bryan Hundven Reviewed-by: Arnd Bergmann Signed-off-by: Uwe Kleine-König Signed-off-by: Mike Turquette Signed-off-by: Arnd Bergmann --- drivers/clk/clk-efm32gg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/clk/clk-efm32gg.c b/drivers/clk/clk-efm32gg.c index bac2ddf49d02..73a8d0ff530c 100644 --- a/drivers/clk/clk-efm32gg.c +++ b/drivers/clk/clk-efm32gg.c @@ -22,7 +22,7 @@ static struct clk_onecell_data clk_data = { .clk_num = ARRAY_SIZE(clk), }; -static int __init efm32gg_cmu_init(struct device_node *np) +static void __init efm32gg_cmu_init(struct device_node *np) { int i; void __iomem *base; @@ -33,7 +33,7 @@ static int __init efm32gg_cmu_init(struct device_node *np) base = of_iomap(np, 0); if (!base) { pr_warn("Failed to map address range for efm32gg,cmu node\n"); - return -EADDRNOTAVAIL; + return; } clk[clk_HFXO] = clk_register_fixed_rate(NULL, "HFXO", NULL, @@ -76,6 +76,6 @@ static int __init efm32gg_cmu_init(struct device_node *np) clk[clk_HFPERCLKDAC0] = clk_register_gate(NULL, "HFPERCLK.DAC0", "HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL); - return of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); + of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); } CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);