[31/42] clk: at91: clk-main: remove parent_names support

Message ID	20230727053156.13587-32-claudiu.beznea@tuxon.dev (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> From: Claudiu Beznea <claudiu.beznea@tuxon.dev> To: mturquette@baylibre.com, sboyd@kernel.org, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, mripard@kernel.org Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, varshini.rajendran@microchip.com, Claudiu Beznea <claudiu.beznea@tuxon.dev> Subject: [PATCH 31/42] clk: at91: clk-main: remove parent_names support Date: Thu, 27 Jul 2023 08:31:45 +0300 Message-Id: <20230727053156.13587-32-claudiu.beznea@tuxon.dev> In-Reply-To: <20230727053156.13587-1-claudiu.beznea@tuxon.dev> References: <20230727053156.13587-1-claudiu.beznea@tuxon.dev> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
Series	clk: at91: add support for parent_data and parent_hw (take #2) \| expand [00/42] clk: at91: add support for parent_data and parent_hw (take #2) [01/42] clk: at91: sama7g5: check __clk_get_hw() argument for errors [02/42] clk: at91: clk-usb: add support for parent_hw [03/42] clk: at91: sam9x60: switch to parent_hw and parent_data [04/42] clk: at91: sam9x60: make checkpatch.pl happy [05/42] clk: at91: clk-pll: add support for parent_hw [06/42] clk: at91: clk-audio-pll: add support for parent_hw [07/42] clk: at91: clk-plldiv: add support for parent_hw [08/42] clk: at91: clk-h32mx: add support for parent_hw [09/42] clk: at91: clk-i2s-mux: add support for parent_hw [10/42] clk: at91: sama5d2: switch to parent_hw and parent_data [11/42] clk: at91: clk-smd: add support for parent_hw [12/42] clk: at91: sama5d3: switch to parent_hw and parent_data [13/42] clk: at91: sama5d3: make checkpatch.pl happy [14/42] clk: at91: sama5d4: switch to parent_hw and parent_data [15/42] clk: at91: at91sam9x5: switch to parent_hw and parent_data [16/42] clk: at91: at91rm9200: switch to parent_hw and parent_data [17/42] clk: at91: at91rm9200: fix checkpatch.pl check [18/42] clk: at91: at91rm9200: fix checkpatch.pl check [19/42] clk: at91: clk-slow: add support for parent_hw [20/42] clk: at91: at91sam9260: switch to parent_hw and parent_data [21/42] clk: at91: at91sam9g45: switch to parent_hw and parent_data [22/42] clk: at91: at91sam9g45: fix checkpatch.pl check [23/42] clk: at91: at91sam9n12: switch to parent_hw and parent_data [24/42] clk: at91: at91sam9n12: remove checkpatch.pl checks [25/42] clk: at91: at91sam9rl: switch to parent_hw [26/42] clk: at91: dt-compat: switch to parent_hw and parent_data [27/42] clk: at91: clk-audio-pll: remove parent_names support [28/42] clk: at91: clk-generated: remove parent_names support [29/42] clk: at91: clk-h32mx: remove parent_names support [30/42] clk: at91: clk-i2s-mux: remove parent_names support [31/42] clk: at91: clk-main: remove parent_names support [32/42] clk: at91: clk-master: remove parent_names support [33/42] clk: at91: clk-peripheral: remove parent_names support [34/42] clk: at91: clk-pll: remove parent_names support [35/42] clk: at91: clk-plldiv: remove parent_names support [36/42] clk: at91: clk-programmable: remove parent_names support [37/42] clk: at91: clk-sam9x60-pll: remove parent_names support [38/42] clk: at91: clk-slow: remove parent_names support [39/42] clk: at91: clk-smd: remove parent_names support [40/42] clk: at91: clk-system: remove parent_names support [41/42] clk: at91: clk-usb: remove parent_names support [42/42] clk: at91: clk-utmi: remove parent_names support

diff --git a/drivers/clk/at91/at91rm9200.c b/drivers/clk/at91/at91rm9200.c index e0418ab5d65c..441b744eed5e 100644 --- a/drivers/clk/at91/at91rm9200.c +++ b/drivers/clk/at91/at91rm9200.c @@ -115,12 +115,12 @@ static void __init at91rm9200_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; - hw = at91_clk_register_rm9200_main(regmap, "mainck", NULL, main_osc_hw); + hw = at91_clk_register_rm9200_main(regmap, "mainck", main_osc_hw); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/at91sam9260.c b/drivers/clk/at91/at91sam9260.c index 1ef7c02bee63..709f01c4dab9 100644 --- a/drivers/clk/at91/at91sam9260.c +++ b/drivers/clk/at91/at91sam9260.c @@ -369,12 +369,12 @@ static void __init at91sam926x_pmc_setup(struct device_node *np, parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(hw)) goto err_free; - hw = at91_clk_register_rm9200_main(regmap, "mainck", NULL, hw); + hw = at91_clk_register_rm9200_main(regmap, "mainck", hw); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/at91sam9g45.c b/drivers/clk/at91/at91sam9g45.c index 868897fad3f0..535f3af23560 100644 --- a/drivers/clk/at91/at91sam9g45.c +++ b/drivers/clk/at91/at91sam9g45.c @@ -130,12 +130,12 @@ static void __init at91sam9g45_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(hw)) goto err_free; - hw = at91_clk_register_rm9200_main(regmap, "mainck", NULL, hw); + hw = at91_clk_register_rm9200_main(regmap, "mainck", hw); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/at91sam9n12.c b/drivers/clk/at91/at91sam9n12.c index 01d943ebb680..9327129d574e 100644 --- a/drivers/clk/at91/at91sam9n12.c +++ b/drivers/clk/at91/at91sam9n12.c @@ -154,14 +154,14 @@ static void __init at91sam9n12_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/at91sam9rl.c b/drivers/clk/at91/at91sam9rl.c index 29f24a5b1fef..67ff1132ef0d 100644 --- a/drivers/clk/at91/at91sam9rl.c +++ b/drivers/clk/at91/at91sam9rl.c @@ -98,7 +98,7 @@ static void __init at91sam9rl_pmc_setup(struct device_node *np) if (!at91sam9rl_pmc) return; - hw = at91_clk_register_rm9200_main(regmap, "mainck", NULL, main_xtal_hw); + hw = at91_clk_register_rm9200_main(regmap, "mainck", main_xtal_hw); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c index 8b2747091b03..7c08a5bdb974 100644 --- a/drivers/clk/at91/at91sam9x5.c +++ b/drivers/clk/at91/at91sam9x5.c @@ -176,14 +176,14 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np, parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 9b462becc693..e4ebc9f88e46 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -151,7 +151,6 @@ static const struct clk_ops main_osc_ops = { struct clk_hw * __init at91_clk_register_main_osc(struct regmap *regmap, const char *name, - const char *parent_name, struct clk_parent_data *parent_data, bool bypass) { @@ -160,7 +159,7 @@ at91_clk_register_main_osc(struct regmap *regmap, struct clk_hw *hw; int ret; - if (!name || !(parent_name || parent_data)) + if (!name || !parent_data) return ERR_PTR(-EINVAL); osc = kzalloc(sizeof(*osc), GFP_KERNEL); @@ -169,10 +168,7 @@ at91_clk_register_main_osc(struct regmap *regmap, init.name = name; init.ops = &main_osc_ops; - if (parent_data) - init.parent_data = (const struct clk_parent_data *)parent_data; - else - init.parent_names = &parent_name; + init.parent_data = (const struct clk_parent_data *)parent_data; init.num_parents = 1; init.flags = CLK_IGNORE_UNUSED; @@ -401,7 +397,6 @@ static const struct clk_ops rm9200_main_ops = { struct clk_hw * __init at91_clk_register_rm9200_main(struct regmap *regmap, const char *name, - const char *parent_name, struct clk_hw *parent_hw) { struct clk_rm9200_main *clkmain; @@ -412,7 +407,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap, if (!name) return ERR_PTR(-EINVAL); - if (!(parent_name || parent_hw)) + if (!parent_hw) return ERR_PTR(-EINVAL); clkmain = kzalloc(sizeof(*clkmain), GFP_KERNEL); @@ -421,10 +416,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap, init.name = name; init.ops = &rm9200_main_ops; - if (parent_hw) - init.parent_hws = (const struct clk_hw **)&parent_hw; - else - init.parent_names = &parent_name; + init.parent_hws = (const struct clk_hw **)&parent_hw; init.num_parents = 1; init.flags = 0; @@ -551,7 +543,6 @@ static const struct clk_ops sam9x5_main_ops = { struct clk_hw * __init at91_clk_register_sam9x5_main(struct regmap *regmap, const char *name, - const char **parent_names, struct clk_hw **parent_hws, int num_parents) { @@ -564,7 +555,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, if (!name) return ERR_PTR(-EINVAL); - if (!(parent_hws || parent_names) || !num_parents) + if (!parent_hws || !num_parents) return ERR_PTR(-EINVAL); clkmain = kzalloc(sizeof(*clkmain), GFP_KERNEL); @@ -573,10 +564,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, init.name = name; init.ops = &sam9x5_main_ops; - if (parent_hws) - init.parent_hws = (const struct clk_hw **)parent_hws; - else - init.parent_names = parent_names; + init.parent_hws = (const struct clk_hw **)parent_hws; init.num_parents = num_parents; init.flags = CLK_SET_PARENT_GATE; diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c index 7ab116a6e701..2bd3ad0a11fd 100644 --- a/drivers/clk/at91/dt-compat.c +++ b/drivers/clk/at91/dt-compat.c @@ -314,7 +314,7 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np) parent_data.name = parent_name; parent_data.fw_name = parent_name; - hw = at91_clk_register_main_osc(regmap, name, NULL, &parent_data, bypass); + hw = at91_clk_register_main_osc(regmap, name, &parent_data, bypass); if (IS_ERR(hw)) return; @@ -375,7 +375,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np) if (!parent_hw) return; - hw = at91_clk_register_rm9200_main(regmap, name, NULL, parent_hw); + hw = at91_clk_register_rm9200_main(regmap, name, parent_hw); if (IS_ERR(hw)) return; @@ -414,8 +414,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np) of_property_read_string(np, "clock-output-names", &name); - hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_hws, - num_parents); + hw = at91_clk_register_sam9x5_main(regmap, name, parent_hws, num_parents); if (IS_ERR(hw)) return; diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index 07f372abcfd0..0b4de5648944 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -160,16 +160,13 @@ at91_clk_register_main_rc_osc(struct regmap *regmap, const char *name, u32 frequency, u32 accuracy); struct clk_hw * __init at91_clk_register_main_osc(struct regmap *regmap, const char *name, - const char *parent_name, struct clk_parent_data *parent_data, bool bypass); struct clk_hw * __init at91_clk_register_rm9200_main(struct regmap *regmap, const char *name, - const char *parent_name, struct clk_hw *parent_hw); struct clk_hw * __init at91_clk_register_sam9x5_main(struct regmap *regmap, const char *name, - const char **parent_names, struct clk_hw **parent_hws, int num_parents); struct clk_hw * __init diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c index 43997f686b87..dbf9841d341f 100644 --- a/drivers/clk/at91/sam9x60.c +++ b/drivers/clk/at91/sam9x60.c @@ -225,14 +225,13 @@ static void __init sam9x60_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, - &parent_data, 0); + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, 0); if (IS_ERR(hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c index 17a40cedd7fb..eda45c5b75f9 100644 --- a/drivers/clk/at91/sama5d2.c +++ b/drivers/clk/at91/sama5d2.c @@ -209,14 +209,14 @@ static void __init sama5d2_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/sama5d3.c b/drivers/clk/at91/sama5d3.c index e1c1ba907e3a..1a149e428971 100644 --- a/drivers/clk/at91/sama5d3.c +++ b/drivers/clk/at91/sama5d3.c @@ -157,14 +157,14 @@ static void __init sama5d3_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - mainck_hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + mainck_hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(mainck_hw)) goto err_free; diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c index b4375cb1c3f3..71fd5714ce31 100644 --- a/drivers/clk/at91/sama5d4.c +++ b/drivers/clk/at91/sama5d4.c @@ -172,14 +172,14 @@ static void __init sama5d4_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - mainck_hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + mainck_hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free; diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index b2d27193741b..a6a79d1450ec 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -1037,14 +1037,14 @@ static void __init sama7g5_pmc_setup(struct device_node *np) parent_data.name = main_xtal_name; parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", &parent_data, bypass); if (IS_ERR(main_osc_hw)) goto err_free; parent_hws[0] = main_rc_hw; parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", parent_hws, 2); if (IS_ERR(hw)) goto err_free;

[31/42] clk: at91: clk-main: remove parent_names support

Commit Message

Patch