From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964878AbcA0QNk (ORCPT ); Wed, 27 Jan 2016 11:13:40 -0500 Received: from down.free-electrons.com ([37.187.137.238]:58536 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933969AbcA0QNa (ORCPT ); Wed, 27 Jan 2016 11:13:30 -0500 From: Alexandre Belloni To: Nicolas Ferre , Boris Brezillon , Stephen Boyd Cc: Jean-Christophe Plagniol-Villard , Michael Turquette , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, Alexandre Belloni Subject: [PATCH v4 04/13] clk: at91: pmc: merge at91_pmc_init in atmel_pmc_probe Date: Wed, 27 Jan 2016 17:11:03 +0100 Message-Id: <1453911072-23608-5-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453911072-23608-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1453911072-23608-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org at91_pmc_init() doesn't do much anymore, merge it in atmel_pmc_probe(). Signed-off-by: Alexandre Belloni Acked-by: Boris Brezillon Acked-by: Stephen Boyd --- drivers/clk/at91/pmc.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c index f17a2a1f1e85..01d049d4248a 100644 --- a/drivers/clk/at91/pmc.c +++ b/drivers/clk/at91/pmc.c @@ -110,30 +110,6 @@ static const struct at91_pmc_caps sama5d3_caps = { AT91_PMC_CFDEV, }; -static struct at91_pmc *__init at91_pmc_init(struct device_node *np, - struct regmap *regmap, - void __iomem *regbase, - const struct at91_pmc_caps *caps) -{ - struct at91_pmc *pmc; - - if (!regbase || !caps) - return NULL; - - at91_pmc_base = regbase; - - pmc = kzalloc(sizeof(*pmc), GFP_KERNEL); - if (!pmc) - return NULL; - - pmc->regmap = regmap; - pmc->caps = caps; - - regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff); - - return pmc; -} - static void __init of_at91_pmc_setup(struct device_node *np, const struct at91_pmc_caps *caps) { @@ -141,13 +117,21 @@ static void __init of_at91_pmc_setup(struct device_node *np, void __iomem *regbase = of_iomap(np, 0); struct regmap *regmap; + at91_pmc_base = regbase; + regmap = syscon_node_to_regmap(np); if (IS_ERR(regmap)) panic("Could not retrieve syscon regmap"); - pmc = at91_pmc_init(np, regmap, regbase, caps); + pmc = kzalloc(sizeof(*pmc), GFP_KERNEL); if (!pmc) return; + + pmc->regmap = regmap; + pmc->caps = caps; + + regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff); + } static void __init of_at91rm9200_pmc_setup(struct device_node *np) -- 2.5.0