diff options
Diffstat (limited to 'drivers/clk/clk-bulk.c')
| -rw-r--r-- | drivers/clk/clk-bulk.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c index 0a0d0f2cb2..db775dc40b 100644 --- a/drivers/clk/clk-bulk.c +++ b/drivers/clk/clk-bulk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2017 NXP * @@ -23,7 +23,7 @@ void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) } EXPORT_SYMBOL_GPL(clk_bulk_put); -static int __clk_bulk_get(struct device_d *dev, int num_clks, +static int __clk_bulk_get(struct device *dev, int num_clks, struct clk_bulk_data *clks, bool optional) { @@ -58,14 +58,14 @@ err: return ret; } -int __must_check clk_bulk_get(struct device_d *dev, int num_clks, +int __must_check clk_bulk_get(struct device *dev, int num_clks, struct clk_bulk_data *clks) { return __clk_bulk_get(dev, num_clks, clks, false); } EXPORT_SYMBOL(clk_bulk_get); -int __must_check clk_bulk_get_optional(struct device_d *dev, int num_clks, +int __must_check clk_bulk_get_optional(struct device *dev, int num_clks, struct clk_bulk_data *clks) { return __clk_bulk_get(dev, num_clks, clks, true); @@ -88,8 +88,9 @@ static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks, clks[i].clk = of_clk_get(np, i); if (IS_ERR(clks[i].clk)) { ret = PTR_ERR(clks[i].clk); - pr_err("%pOF: Failed to get clk index: %d ret: %d\n", - np, i, ret); + if (ret != -EPROBE_DEFER) + pr_err("%s: Failed to get clk index: %d ret: %pe\n", + np->name, i, clks[i].clk); clks[i].clk = NULL; goto err; } @@ -140,10 +141,10 @@ void clk_bulk_put_all(int num_clks, struct clk_bulk_data *clks) } EXPORT_SYMBOL(clk_bulk_put_all); -int __must_check clk_bulk_get_all(struct device_d *dev, +int __must_check clk_bulk_get_all(struct device *dev, struct clk_bulk_data **clks) { - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; if (!np) return 0; |