Skip to content

Commit 4ae2c99

Browse files
committed
clk: renesas: mstp: Remove obsolete clkdev registration
After the DT conversion of SH-Mobile and Armadillo-800-EVA display support, all devices are registered from DT, so we can remove the registration of clkdevs. Add the missing #include <linux/slab.h>, which was included implicitly through <linux/clkdev.h> before. Reviewed-by: Niklas Söderlund <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/e98a6e47ebecc44fa41de6d88b4ed20c6efbd177.1705931322.git.geert+renesas@glider.be
1 parent 6aa1754 commit 4ae2c99

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

drivers/clk/renesas/clk-mstp.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <linux/clk.h>
1212
#include <linux/clk-provider.h>
13-
#include <linux/clkdev.h>
1413
#include <linux/clk/renesas.h>
1514
#include <linux/device.h>
1615
#include <linux/io.h>
@@ -19,6 +18,7 @@
1918
#include <linux/of_address.h>
2019
#include <linux/pm_clock.h>
2120
#include <linux/pm_domain.h>
21+
#include <linux/slab.h>
2222
#include <linux/spinlock.h>
2323

2424
/*
@@ -237,22 +237,12 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
237237

238238
clks[clkidx] = cpg_mstp_clock_register(name, parent_name,
239239
clkidx, group);
240-
if (!IS_ERR(clks[clkidx])) {
240+
if (!IS_ERR(clks[clkidx]))
241241
group->data.clk_num = max(group->data.clk_num,
242242
clkidx + 1);
243-
/*
244-
* Register a clkdev to let board code retrieve the
245-
* clock by name and register aliases for non-DT
246-
* devices.
247-
*
248-
* FIXME: Remove this when all devices that require a
249-
* clock will be instantiated from DT.
250-
*/
251-
clk_register_clkdev(clks[clkidx], name, NULL);
252-
} else {
243+
else
253244
pr_err("%s: failed to register %pOFn %s clock (%ld)\n",
254245
__func__, np, name, PTR_ERR(clks[clkidx]));
255-
}
256246
}
257247

258248
of_clk_add_provider(np, of_clk_src_onecell_get, &group->data);

0 commit comments

Comments
 (0)