[PATCH] staging: clocking-wizard: Add support for dynamic reconfiguration

Dan Carpenter dan.carpenter at oracle.com
Mon Sep 10 09:54:25 UTC 2018


On Mon, Sep 10, 2018 at 10:47:28AM +0530, shubhrajyoti.datta at gmail.com wrote:
> +static struct clk *clk_wzrd_register_divider(struct device *dev,
> +					     const char *name,
> +					     const char *parent_name,
> +					     unsigned long flags,
> +					     void __iomem *base, u16 offset,
> +					     u8 shift, u8 width,
> +					     u8 clk_divider_flags,
> +					     const struct clk_div_table *table,
> +					     spinlock_t *lock)
> +{
> +	struct clk_wzrd_divider *div;
> +	struct clk_hw *hw;
> +	struct clk_init_data init;
> +	int ret;
> +
> +	if (clk_divider_flags & CLK_DIVIDER_HIWORD_MASK) {
> +		if (width + shift > 16) {
> +			pr_warn("divider value exceeds LOWORD field\n");
> +			return ERR_PTR(-EINVAL);
> +		}
> +	}
> +
> +	/* allocate the divider */
> +	div = kzalloc(sizeof(*div), GFP_KERNEL);
> +	if (!div)
> +		return ERR_PTR(-ENOMEM);
> +
> +	init.name = name;
> +	if (clk_divider_flags & CLK_DIVIDER_READ_ONLY)
> +		init.ops = &clk_divider_ro_ops;
> +	else
> +		init.ops = &clk_wzrd_clk_divider_ops;
> +	init.flags = flags | CLK_IS_BASIC;
> +	init.parent_names = (parent_name ? &parent_name : NULL);
> +	init.num_parents = (parent_name ? 1 : 0);
> +
> +	/* struct clk_divider assignments */
> +	div->base = base;
> +	div->offset = offset;
> +	div->shift = shift;
> +	div->width = width;
> +	div->flags = clk_divider_flags;
> +	div->lock = lock;
> +	div->hw.init = &init;
> +	div->table = table;
> +
> +	/* register the clock */
> +	hw = &div->hw;
> +	ret = clk_hw_register(dev, hw);
> +	if (ret) {
> +		kfree(div);
> +		hw = ERR_PTR(ret);

This should be "return ERR_PTR(ret);" otherwise we Oops on the next
line.  Smatch or Coccinelle would probably have caught this.

> +	}
> +
> +	return hw->clk;
> +}
> +
>  static int clk_wzrd_clk_notifier(struct notifier_block *nb, unsigned long event,
>  				 void *data)
>  {
> @@ -240,11 +438,14 @@ static int clk_wzrd_probe(struct platform_device *pdev)
>  			ret = -EINVAL;
>  			goto err_rm_int_clks;
>  		}
> -		reg = readl(clk_wzrd->base + WZRD_CLK_CFG_REG(2) + i * 12);
> -		reg &= WZRD_CLKOUT_DIVIDE_MASK;
> -		reg >>= WZRD_CLKOUT_DIVIDE_SHIFT;
> -		clk_wzrd->clkout[i] = clk_register_fixed_factor(&pdev->dev,
> -				clkout_name, clk_name, 0, 1, reg);
> +		clk_wzrd->clkout[i] = clk_wzrd_register_divider(&pdev->dev,
> +								clkout_name,

The line is indented too far.

> +				clk_name, 0,
> +				clk_wzrd->base, (WZRD_CLK_CFG_REG(2) + i * 12),
> +				WZRD_CLKOUT_DIVIDE_SHIFT,
> +				WZRD_CLKOUT_DIVIDE_WIDTH,
> +				CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
> +				NULL, &clkwzrd_lock);
>  		if (IS_ERR(clk_wzrd->clkout[i])) {

regards,
dan carpenter



More information about the devel mailing list