kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clk: Return void from debug_init op

Browse source 
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: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Stephen Boyd 2018-06-01 21:42:07 -07:00
parent c1c2873df0
commit d75d50c016
4 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/clk.txt
View file

@ -96,7 +96,7 @@ the operations defined in clk-provider.h::
int (*get_phase)(struct clk_hw *hw); int (*get_phase)(struct clk_hw *hw);
int (*set_phase)(struct clk_hw *hw, int degrees); int (*set_phase)(struct clk_hw *hw, int degrees);
void (*init)(struct clk_hw *hw); void (*init)(struct clk_hw *hw);
int (*debug_init)(struct clk_hw *hw, void (*debug_init)(struct clk_hw *hw,
struct dentry *dentry); struct dentry *dentry);
}; };

25
drivers/clk/bcm/clk-bcm2835.c
View file

@ -394,7 +394,7 @@ out:
return count * 1000; 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 debugfs_reg32 *regs, size_t nregs,
struct dentry *dentry) 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); regset = devm_kzalloc(cprman->dev, sizeof(*regset), GFP_KERNEL);
if (!regset) if (!regset)
return -ENOMEM; return;
regset->regs = regs; regset->regs = regs;
regset->nregs = nregs; regset->nregs = nregs;
regset->base = cprman->regs + base; regset->base = cprman->regs + base;
debugfs_create_regset32("regdump", S_IRUGO, dentry, regset); debugfs_create_regset32("regdump", S_IRUGO, dentry, regset);
return 0;
} }
struct bcm2835_pll_data { struct bcm2835_pll_data {
@ -728,7 +726,7 @@ static int bcm2835_pll_set_rate(struct clk_hw *hw,
return 0; 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 dentry *dentry)
{ {
struct bcm2835_pll *pll = container_of(hw, struct bcm2835_pll, hw); 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); regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);
if (!regs) if (!regs)
return -ENOMEM; return;
regs[0].name = "cm_ctrl"; regs[0].name = "cm_ctrl";
regs[0].offset = data->cm_ctrl_reg; 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].name = "ana3";
regs[6].offset = data->ana_reg_base + 3 * 4; 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 = { static const struct clk_ops bcm2835_pll_clk_ops = {
@ -859,8 +857,8 @@ static int bcm2835_pll_divider_set_rate(struct clk_hw *hw,
return 0; 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 dentry *dentry)
{ {
struct bcm2835_pll_divider *divider = bcm2835_pll_divider_from_hw(hw); struct bcm2835_pll_divider *divider = bcm2835_pll_divider_from_hw(hw);
struct bcm2835_cprman *cprman = divider->cprman; struct bcm2835_cprman *cprman = divider->cprman;
@ -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); regs = devm_kzalloc(cprman->dev, 7 * sizeof(*regs), GFP_KERNEL);
if (!regs) if (!regs)
return -ENOMEM; return;
regs[0].name = "cm"; regs[0].name = "cm";
regs[0].offset = data->cm_reg; regs[0].offset = data->cm_reg;
regs[1].name = "a2w"; regs[1].name = "a2w";
regs[1].offset = data->a2w_reg; 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 = { 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 dentry *dentry)
{ {
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
struct bcm2835_cprman *cprman = clock->cprman; struct bcm2835_cprman *cprman = clock->cprman;
const struct bcm2835_clock_data *data = clock->data; const struct bcm2835_clock_data *data = clock->data;
return bcm2835_debugfs_regset( bcm2835_debugfs_regset(cprman, data->ctl_reg,
cprman, data->ctl_reg,
bcm2835_debugfs_clock_reg32, bcm2835_debugfs_clock_reg32,
ARRAY_SIZE(bcm2835_debugfs_clock_reg32), ARRAY_SIZE(bcm2835_debugfs_clock_reg32),
dentry); dentry);

8
drivers/clk/davinci/pll.c
View file

@ -190,7 +190,7 @@ static int davinci_pll_set_rate(struct clk_hw *hw, unsigned long rate,
} }
#ifdef CONFIG_DEBUG_FS #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 #else
#define davinci_pll_debug_init NULL #define davinci_pll_debug_init NULL
#endif #endif
@ -874,21 +874,19 @@ static const struct debugfs_reg32 davinci_pll_regs[] = {
DEBUG_REG(PLLDIV9), 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 davinci_pll_clk *pll = to_davinci_pll_clk(hw);
struct debugfs_regset32 *regset; struct debugfs_regset32 *regset;
regset = kzalloc(sizeof(*regset), GFP_KERNEL); regset = kzalloc(sizeof(*regset), GFP_KERNEL);
if (!regset) if (!regset)
return -ENOMEM; return;
regset->regs = davinci_pll_regs; regset->regs = davinci_pll_regs;
regset->nregs = ARRAY_SIZE(davinci_pll_regs); regset->nregs = ARRAY_SIZE(davinci_pll_regs);
regset->base = pll->base; regset->base = pll->base;
debugfs_create_regset32("registers", 0400, dentry, regset); debugfs_create_regset32("registers", 0400, dentry, regset);
return 0;
} }
#endif #endif

2
include/linux/clk-provider.h
View file

@ -218,7 +218,7 @@ struct clk_ops {
int (*get_phase)(struct clk_hw *hw); int (*get_phase)(struct clk_hw *hw);
int (*set_phase)(struct clk_hw *hw, int degrees); int (*set_phase)(struct clk_hw *hw, int degrees);
void (*init)(struct clk_hw *hw); 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);
}; };
/** /**