projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next'
[oweals/u-boot.git]
/
drivers
/
timer
/
timer-uclass.c
diff --git
a/drivers/timer/timer-uclass.c
b/drivers/timer/timer-uclass.c
index 83d1a35e0622afc325fcc250a91d5aec52c20eb9..f8ddf93cf8157fcf2a2de60fcab046914829d66e 100644
(file)
--- a/
drivers/timer/timer-uclass.c
+++ b/
drivers/timer/timer-uclass.c
@@
-22,7
+22,7
@@
DECLARE_GLOBAL_DATA_PTR;
* tick, and no timer interrupt.
*/
* tick, and no timer interrupt.
*/
-int timer_get_count(struct udevice *dev, u64 *count)
+int
notrace
timer_get_count(struct udevice *dev, u64 *count)
{
const struct timer_ops *ops = device_get_ops(dev);
{
const struct timer_ops *ops = device_get_ops(dev);
@@
-32,9
+32,9
@@
int timer_get_count(struct udevice *dev, u64 *count)
return ops->get_count(dev, count);
}
return ops->get_count(dev, count);
}
-unsigned long timer_get_rate(struct udevice *dev)
+unsigned long
notrace
timer_get_rate(struct udevice *dev)
{
{
- struct timer_dev_priv *uc_priv = dev
_get_uclass_priv(dev)
;
+ struct timer_dev_priv *uc_priv = dev
->uclass_priv
;
return uc_priv->clock_rate;
}
return uc_priv->clock_rate;
}
@@
-82,11
+82,9
@@
int notrace dm_timer_init(void)
node = fdtdec_get_chosen_node(blob, "tick-timer");
if (node < 0) {
/* No chosen timer, trying first available timer */
node = fdtdec_get_chosen_node(blob, "tick-timer");
if (node < 0) {
/* No chosen timer, trying first available timer */
- ret = uclass_first_device(UCLASS_TIMER, &dev);
+ ret = uclass_first_device
_err
(UCLASS_TIMER, &dev);
if (ret)
return ret;
if (ret)
return ret;
- if (!dev)
- return -ENODEV;
} else {
if (uclass_get_device_by_of_offset(UCLASS_TIMER, node, &dev)) {
/*
} else {
if (uclass_get_device_by_of_offset(UCLASS_TIMER, node, &dev)) {
/*