clk: mediatek: Drop __init from mtk_clk_register_cpumuxes()
Subsystems (2)
Stephen Boyd
maintainerPATCH 1/2 clk: mediatek: Drop __init from mtk_clk_register_cpumuxes()
This function is used from more places than just __init code. Removing __init silences a section mismatch warning here.
Cc Sean Wang <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Rob Herring <[email protected]>
Cc Wenzhen Yu <[email protected]>
Cc Weiyi Lu <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
--- drivers/clk/mediatek/clk-cpumux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/mediatek/clk-cpumux.c +4 -4
@@ -53,7 +53,7 @@ static const struct clk_ops clk_cpumux_ops = { .set_parent = clk_cpumux_set_parent, }; -static struct clk __init * +static struct clk *mtk_clk_register_cpumux (const struct mtk_composite *mux,struct regmap *regmap) {
@@ -84,9 +84,9 @@ mtk_clk_register_cpumux(const struct mtk_composite *mux,return clk; } -int __init mtk_clk_register_cpumuxes (struct device_node *node, -const struct mtk_composite *clks,int num, -struct clk_onecell_data *clk_data) +int mtk_clk_register_cpumuxes (struct device_node *node, +const struct mtk_composite *clks,int num, +struct clk_onecell_data *clk_data) {int i;struct clk *clk;
Signature · 1 line
Sent by a computer through tubes
Stephen Boyd
maintainerPATCH 2/2 clk: mediatek: Drop more __init markings for driver probe
This function is called from driver probe, which isn't the same as __init code because driver probe can happen later. Drop the __init marking here to fix this potential problem.
Cc Sean Wang <[email protected]>
Cc Ryder Lee <[email protected]>
Cc Rob Herring <[email protected]>
Cc Wenzhen Yu <[email protected]>
Cc Weiyi Lu <[email protected]>
Fixes 2fc0a509e4ee ("clk: mediatek: add clock support for MT7622 SoC")
Signed-off-by Stephen Boyd <[email protected]>
--- drivers/clk/mediatek/clk-mt7622.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-mt7622.c +2 -2
@@ -513,7 +513,7 @@ static const struct mtk_gate peri_clks[] = { GATE_PERI1(CLK_PERI_IRTX_PD, "peri_irtx_pd", "irtx_sel", 2), }; -static struct mtk_composite infra_muxes[]__initdata = { +static struct mtk_composite infra_muxes[] = {MUX (CLK_INFRA_MUX1_SEL ,"infra_mux1_sel" , infra_mux1_parents,0x000 ,2 ,2 ), };
@@ -652,7 +652,7 @@ static int mtk_topckgen_init(struct platform_device *pdev)return of_clk_add_provider (node, of_clk_src_onecell_get, clk_data); } -static int __init mtk_infrasys_init (struct platform_device *pdev) +static int mtk_infrasys_init (struct platform_device *pdev) {struct device_node *node = pdev->dev.of_node;struct clk_onecell_data *clk_data;
Signature · 1 line
Sent by a computer through tubes