summaryrefslogtreecommitdiffstats
path: root/drivers/timer/timer-uclass.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-26 16:22:28 -0500
committerTom Rini <trini@konsulko.com>2016-02-26 16:22:28 -0500
commitd5c6144fe326e255e42ec273fc5d88f45cd61548 (patch)
tree470446ad6c9d5580b0ff778d5adc77ee05f6e1b8 /drivers/timer/timer-uclass.c
parent38e65aeb70b72132c0d2ec0ed389f7fc8b7bdf4c (diff)
parent6796704b0dfb4f98cb4a026988e9739884812b5c (diff)
downloadblackbird-obmc-uboot-d5c6144fe326e255e42ec273fc5d88f45cd61548.tar.gz
blackbird-obmc-uboot-d5c6144fe326e255e42ec273fc5d88f45cd61548.zip
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/timer/timer-uclass.c')
-rw-r--r--drivers/timer/timer-uclass.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 83d1a35e06..382c0f2bd1 100644
--- 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.
*/
-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);
@@ -32,9 +32,9 @@ int timer_get_count(struct udevice *dev, u64 *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;
}
OpenPOWER on IntegriCloud