|
@@ -394,7 +394,7 @@ out:
|
|
|
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,8 +857,8 @@ static int bcm2835_pll_divider_set_rate(struct clk_hw *hw,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int bcm2835_pll_divider_debug_init(struct clk_hw *hw,
|
|
|
- struct dentry *dentry)
|
|
|
+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);
|
|
|
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);
|
|
|
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);
|