[RFC PATCH 1/3] clk: bd718x7: Clean up the code, no functional changes

From: Michael Trimarchi
Date: Sun Jun 05 2022 - 12:57:16 EST


Signed-off-by: Michael Trimarchi <michael@xxxxxxxxxxxxxxxxxxxx>
---
drivers/clk/clk-bd718x7.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/clk/clk-bd718x7.c b/drivers/clk/clk-bd718x7.c
index ac40b669d60b..04cc0beb67df 100644
--- a/drivers/clk/clk-bd718x7.c
+++ b/drivers/clk/clk-bd718x7.c
@@ -81,27 +81,28 @@ static int bd71837_clk_probe(struct platform_device *pdev)
struct bd718xx_clk *c;
int rval = -ENOMEM;
const char *parent_clk;
+ struct device *dev = &pdev->dev;
struct device *parent = pdev->dev.parent;
struct clk_init_data init = {
.name = "bd718xx-32k-out",
.ops = &bd71837_clk_ops,
+ .num_parents = 1,
};
enum rohm_chip_type chip = platform_get_device_id(pdev)->driver_data;

- c = devm_kzalloc(&pdev->dev, sizeof(*c), GFP_KERNEL);
+ c = devm_kzalloc(dev, sizeof(*c), GFP_KERNEL);
if (!c)
return -ENOMEM;

- c->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+ c->regmap = dev_get_regmap(parent, NULL);
if (!c->regmap)
return -ENODEV;

- init.num_parents = 1;
parent_clk = of_clk_get_parent_name(parent->of_node, 0);

init.parent_names = &parent_clk;
if (!parent_clk) {
- dev_err(&pdev->dev, "No parent clk found\n");
+ dev_err(dev, "No parent clk found\n");
return -EINVAL;
}
switch (chip) {
@@ -119,7 +120,7 @@ static int bd71837_clk_probe(struct platform_device *pdev)
c->mask = CLK_OUT_EN_MASK;
break;
default:
- dev_err(&pdev->dev, "Unknown clk chip\n");
+ dev_err(dev, "Unknown clk chip\n");
return -EINVAL;
}
c->pdev = pdev;
@@ -128,15 +129,15 @@ static int bd71837_clk_probe(struct platform_device *pdev)
of_property_read_string_index(parent->of_node,
"clock-output-names", 0, &init.name);

- rval = devm_clk_hw_register(&pdev->dev, &c->hw);
+ rval = devm_clk_hw_register(dev, &c->hw);
if (rval) {
- dev_err(&pdev->dev, "failed to register 32K clk");
+ dev_err(dev, "failed to register 32K clk");
return rval;
}
- rval = devm_of_clk_add_hw_provider(&pdev->dev, of_clk_hw_simple_get,
+ rval = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get,
&c->hw);
if (rval)
- dev_err(&pdev->dev, "adding clk provider failed\n");
+ dev_err(dev, "adding clk provider failed\n");

return rval;
}
--
2.25.1