From mboxrd@z Thu Jan 1 00:00:00 1970 From: mturquette@baylibre.com (Michael Turquette) Date: Wed, 30 May 2018 12:46:02 -0700 Subject: [PATCH 6/9] clk: davinci: pll: allow dev == NULL In-Reply-To: <20180525181150.17873-7-david@lechnology.com> References: <20180525181150.17873-1-david@lechnology.com> <20180525181150.17873-7-david@lechnology.com> Message-ID: <20180530194559.982.42844@harbor.lan> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi David, Quoting David Lechner (2018-05-25 11:11:47) > This modifies the TI Davinci PLL clock driver to allow for the case > when dev == NULL. On some (most) SoCs that use this driver, the PLL > clock needs to be registered during early boot because it is used > for clocksource/clkevent and there will be no platform device available. A lot of this stuff feels like a step backwards. E.g: > diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c > index 23a24c944f1d..2eb981e61185 100644 > --- a/drivers/clk/davinci/pll.c > +++ b/drivers/clk/davinci/pll.c > @@ -11,6 +11,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -223,6 +224,7 @@ static const struct clk_ops dm365_pll_ops = { > > /** > * davinci_pll_div_register - common *DIV clock implementation > + * @dev: The PLL platform device or NULL > * @name: the clock name > * @parent_name: the parent clock name > * @reg: the *DIV register > @@ -240,17 +242,21 @@ static struct clk *davinci_pll_div_register(struct device *dev, > const struct clk_ops *divider_ops = &clk_divider_ops; > struct clk_gate *gate; > struct clk_divider *divider; > + struct clk *clk; > + int ret; > > - gate = devm_kzalloc(dev, sizeof(*gate), GFP_KERNEL); > + gate = kzalloc(sizeof(*gate), GFP_KERNEL); > if (!gate) > return ERR_PTR(-ENOMEM); > > gate->reg = reg; > gate->bit_idx = DIV_ENABLE_SHIFT; > > - divider = devm_kzalloc(dev, sizeof(*divider), GFP_KERNEL); > - if (!divider) > - return ERR_PTR(-ENOMEM); > + divider = kzalloc(sizeof(*divider), GFP_KERNEL); > + if (!divider) { > + ret = -ENOMEM; > + goto err_free_gate; > + } > > divider->reg = reg; > divider->shift = DIV_RATIO_SHIFT; Oh no my poor devm_ helpers! I understand that we need to support early boot drivers better, so this patch can be merged. However I'm curious if you're tracking Bartosz's early_platform_driver efforts? Converting to that if it is ever merged would likely be cleaner: https://lkml.kernel.org/r/20180511162028.20616-1-brgl at bgdev.pl Best regards, Mike