diff options
Diffstat (limited to 'drivers/clk/clkdev.c')
-rw-r--r-- | drivers/clk/clkdev.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index f67a5c4d98..dbe998b6af 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/clk/lookup_clkdev.c * * Copyright (C) 2008 Russell King. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * Helper for the clk API to assist looking up a struct clk. */ @@ -73,8 +70,8 @@ struct clk *of_clk_get_by_name(struct device_node *np, const char *name) if (!IS_ERR(clk)) break; else if (name && index >= 0) { - pr_err("ERROR: could not get clock %s:%s(%i)\n", - np->full_name, name ? name : "", index); + pr_err("ERROR: could not get clock %pOF:%s(%i)\n", + np, name ? name : "", index); return clk; } @@ -132,7 +129,7 @@ static struct clk *clk_find(const char *dev_id, const char *con_id) return clk; } -static struct clk *clk_find_physbase(struct device_d *dev, const char *con_id) +static struct clk *clk_find_physbase(struct device *dev, const char *con_id) { struct clk_lookup *p; unsigned long start; @@ -170,7 +167,7 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id) } EXPORT_SYMBOL(clk_get_sys); -struct clk *clk_get(struct device_d *dev, const char *con_id) +struct clk *clk_get(struct device *dev, const char *con_id) { const char *dev_id = dev ? dev_name(dev) : NULL; struct clk *clk; @@ -179,9 +176,9 @@ struct clk *clk_get(struct device_d *dev, const char *con_id) if (!IS_ERR(clk)) return clk; - if (dev) { - clk = of_clk_get_by_name(dev->device_node, con_id); - if (!IS_ERR(clk) || PTR_ERR(clk) != -ENOENT) + if (dev && dev->of_node) { + clk = of_clk_get_by_name(dev->of_node, con_id); + if (!IS_ERR(clk) || PTR_ERR(clk) == -EPROBE_DEFER) return clk; } @@ -268,7 +265,7 @@ int clk_register_clkdev(struct clk *clk, const char *con_id, } int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, - struct device_d *dev) + struct device *dev) { struct clk *r = clk_get(dev, id); struct clk_lookup *l; |