| Message ID | E1Ye59j-0001Bd-0T@rmk-PC.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
* Russell King <rmk+kernel@arm.linux.org.uk> [150403 10:14]: > Rather than open coding the clkdev allocation, initialisation and > addition, use the clkdev_create() helper. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c > index 85e0b0c06718..b64d717bfab6 100644 > --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c > +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c > @@ -232,14 +232,12 @@ void omap2xxx_clkt_vps_init(void) > struct clk_hw_omap *hw = NULL; > struct clk *clk; > const char *parent_name = "mpu_ck"; > - struct clk_lookup *lookup = NULL; > > omap2xxx_clkt_vps_late_init(); > omap2xxx_clkt_vps_check_bootloader_rates(); > > hw = kzalloc(sizeof(*hw), GFP_KERNEL); > - lookup = kzalloc(sizeof(*lookup), GFP_KERNEL); > - if (!hw || !lookup) > + if (!hw) > goto cleanup; > init.name = "virt_prcm_set"; > init.ops = &virt_prcm_set_ops; > @@ -249,15 +247,9 @@ void omap2xxx_clkt_vps_init(void) > hw->hw.init = &init; > > clk = clk_register(NULL, &hw->hw); > - > - lookup->dev_id = NULL; > - lookup->con_id = "cpufreq_ck"; > - lookup->clk = clk; > - > - clkdev_add(lookup); > + clkdev_create(clk, "cpufreq_ck", NULL); > return; > cleanup: > kfree(hw); > - kfree(lookup); > } > #endif > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c index 85e0b0c06718..b64d717bfab6 100644 --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c @@ -232,14 +232,12 @@ void omap2xxx_clkt_vps_init(void) struct clk_hw_omap *hw = NULL; struct clk *clk; const char *parent_name = "mpu_ck"; - struct clk_lookup *lookup = NULL; omap2xxx_clkt_vps_late_init(); omap2xxx_clkt_vps_check_bootloader_rates(); hw = kzalloc(sizeof(*hw), GFP_KERNEL); - lookup = kzalloc(sizeof(*lookup), GFP_KERNEL); - if (!hw || !lookup) + if (!hw) goto cleanup; init.name = "virt_prcm_set"; init.ops = &virt_prcm_set_ops; @@ -249,15 +247,9 @@ void omap2xxx_clkt_vps_init(void) hw->hw.init = &init; clk = clk_register(NULL, &hw->hw); - - lookup->dev_id = NULL; - lookup->con_id = "cpufreq_ck"; - lookup->clk = clk; - - clkdev_add(lookup); + clkdev_create(clk, "cpufreq_ck", NULL); return; cleanup: kfree(hw); - kfree(lookup); } #endif
Rather than open coding the clkdev allocation, initialisation and addition, use the clkdev_create() helper. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)