Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: at91: pmc: merge at91_pmc_init in atmel_pmc_probe

at91_pmc_init() doesn't do much anymore, merge it in atmel_pmc_probe().

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>

+9 -25
+9 -25
drivers/clk/at91/pmc.c
··· 110 110 AT91_PMC_CFDEV, 111 111 }; 112 112 113 - static struct at91_pmc *__init at91_pmc_init(struct device_node *np, 114 - struct regmap *regmap, 115 - void __iomem *regbase, 116 - const struct at91_pmc_caps *caps) 117 - { 118 - struct at91_pmc *pmc; 119 - 120 - if (!regbase || !caps) 121 - return NULL; 122 - 123 - at91_pmc_base = regbase; 124 - 125 - pmc = kzalloc(sizeof(*pmc), GFP_KERNEL); 126 - if (!pmc) 127 - return NULL; 128 - 129 - pmc->regmap = regmap; 130 - pmc->caps = caps; 131 - 132 - regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff); 133 - 134 - return pmc; 135 - } 136 - 137 113 static void __init of_at91_pmc_setup(struct device_node *np, 138 114 const struct at91_pmc_caps *caps) 139 115 { ··· 117 141 void __iomem *regbase = of_iomap(np, 0); 118 142 struct regmap *regmap; 119 143 144 + at91_pmc_base = regbase; 145 + 120 146 regmap = syscon_node_to_regmap(np); 121 147 if (IS_ERR(regmap)) 122 148 panic("Could not retrieve syscon regmap"); 123 149 124 - pmc = at91_pmc_init(np, regmap, regbase, caps); 150 + pmc = kzalloc(sizeof(*pmc), GFP_KERNEL); 125 151 if (!pmc) 126 152 return; 153 + 154 + pmc->regmap = regmap; 155 + pmc->caps = caps; 156 + 157 + regmap_write(pmc->regmap, AT91_PMC_IDR, 0xffffffff); 158 + 127 159 } 128 160 129 161 static void __init of_at91rm9200_pmc_setup(struct device_node *np)