Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d75d50c0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: Return void from debug_init op 



We only have two users of the debug_init hook, and we recently stopped
caring about the return value from that op. Finish that off by changing
the clk_op to return void instead of int because it doesn't matter if
debugfs fails or not.

Cc: Eric Anholt <eric@anholt.net>
Cc: David Lechner <david@lechnology.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent c1c2873d

Documentation/clk.txt

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ the operations defined in clk-provider.h:: 
		int		(*get_phase)(struct clk_hw *hw);

		int		(*set_phase)(struct clk_hw *hw, int degrees);

		void		(*init)(struct clk_hw *hw);

		int		(*debug_init)(struct clk_hw *hw,

		void		(*debug_init)(struct clk_hw *hw,

					      struct dentry *dentry);

	};

drivers/clk/bcm/clk-bcm2835.c

+11 −14
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static unsigned long bcm2835_measure_tcnt_mux(struct bcm2835_cprman *cprman, 
	return count * 1000;

}



static int bcm2835_debugfs_regset(struct bcm2835_cprman *cprman, u32 base,

static void bcm2835_debugfs_regset(struct bcm2835_cprman *cprman, u32 base,

				  struct debugfs_reg32 *regs, size_t nregs,

				  struct dentry *dentry)

{
@@ -402,15 +402,13 @@ static int bcm2835_debugfs_regset(struct bcm2835_cprman *cprman, u32 base, 


	regset = devm_kzalloc(cprman->dev, sizeof(*regset), GFP_KERNEL);

	if (!regset)

		return -ENOMEM;

		return;



	regset->regs = regs;

	regset->nregs = nregs;

	regset->base = cprman->regs + base;



	debugfs_create_regset32("regdump", S_IRUGO, dentry, regset);



	return 0;

}



struct bcm2835_pll_data {
@@ -728,7 +726,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw, 
	return 0;

}



static int bcm2835_pll_debug_init(struct clk_hw *hw,

static void bcm2835_pll_debug_init(struct clk_hw *hw,

				  struct dentry *dentry)

{

	struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw);
@@ -738,7 +736,7 @@ static int bcm2835_pll_debug_init(struct clk_hw *hw, 


	regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);

	if (!regs)

		return -ENOMEM;

		return;



	regs[0].name = "cm_ctrl";

	regs[0].offset = data->cm_ctrl_reg;
@@ -755,7 +753,7 @@ static int bcm2835_pll_debug_init(struct clk_hw *hw, 
	regs[6].name = "ana3";

	regs[6].offset = data->ana_reg_base + 3 * 4;



	return bcm2835_debugfs_regset(cprman, 0, regs, 7, dentry);

	bcm2835_debugfs_regset(cprman, 0, regs, 7, dentry);

}



static const struct clk_ops bcm2835_pll_clk_ops = {
@@ -859,7 +857,7 @@ static int bcm2835_pll_divider_set_rate(struct clk_hw *hw, 
	return 0;

}



static int bcm2835_pll_divider_debug_init(struct clk_hw *hw,

static void bcm2835_pll_divider_debug_init(struct clk_hw *hw,

					   struct dentry *dentry)

{

	struct bcm2835_pll_divider *divider = bcm2835_pll_divider_from_hw(hw);
@@ -869,14 +867,14 @@ static int bcm2835_pll_divider_debug_init(struct clk_hw *hw, 


	regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);

	if (!regs)

		return -ENOMEM;

		return;



	regs[0].name = "cm";

	regs[0].offset = data->cm_reg;

	regs[1].name = "a2w";

	regs[1].offset = data->a2w_reg;



	return bcm2835_debugfs_regset(cprman, 0, regs, 2, dentry);

	bcm2835_debugfs_regset(cprman, 0, regs, 2, dentry);

}



static const struct clk_ops bcm2835_pll_divider_clk_ops = {
@@ -1252,15 +1250,14 @@ static struct debugfs_reg32 bcm2835_debugfs_clock_reg32[] = { 
	},

};



static int bcm2835_clock_debug_init(struct clk_hw *hw,

static void bcm2835_clock_debug_init(struct clk_hw *hw,

				    struct dentry *dentry)

{

	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);

	struct bcm2835_cprman *cprman = clock->cprman;

	const struct bcm2835_clock_data *data = clock->data;



	return bcm2835_debugfs_regset(

		cprman, data->ctl_reg,

	bcm2835_debugfs_regset(cprman, data->ctl_reg,

		bcm2835_debugfs_clock_reg32,

		ARRAY_SIZE(bcm2835_debugfs_clock_reg32),

		dentry);

drivers/clk/davinci/pll.c

+3 −5
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int davinci_pll_set_rate(struct clk_hw *hw, unsigned long rate, 
}



#ifdef CONFIG_DEBUG_FS

static int davinci_pll_debug_init(struct clk_hw *hw, struct dentry *dentry);

static void davinci_pll_debug_init(struct clk_hw *hw, struct dentry *dentry);

#else

#define davinci_pll_debug_init NULL

#endif
@@ -874,21 +874,19 @@ static const struct debugfs_reg32 davinci_pll_regs[] = { 
	DEBUG_REG(PLLDIV9),

};



static int davinci_pll_debug_init(struct clk_hw *hw, struct dentry *dentry)

static void davinci_pll_debug_init(struct clk_hw *hw, struct dentry *dentry)

{

	struct davinci_pll_clk *pll = to_davinci_pll_clk(hw);

	struct debugfs_regset32 *regset;



	regset = kzalloc(sizeof(*regset), GFP_KERNEL);

	if (!regset)

		return -ENOMEM;

		return;



	regset->regs = davinci_pll_regs;

	regset->nregs = ARRAY_SIZE(davinci_pll_regs);

	regset->base = pll->base;



	debugfs_create_regset32("registers", 0400, dentry, regset);



	return 0;

}

#endif

include/linux/clk-provider.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ struct clk_ops { 
	int		(*get_phase)(struct clk_hw *hw);

	int		(*set_phase)(struct clk_hw *hw, int degrees);

	void		(*init)(struct clk_hw *hw);

	int		(*debug_init)(struct clk_hw *hw, struct dentry *dentry);

	void		(*debug_init)(struct clk_hw *hw, struct dentry *dentry);

};



/**