diff options
author | Tony Lindgren <tony@atomide.com> | 2017-11-28 08:12:32 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 08:12:32 -0800 |
commit | bc686442f8a601bccac1f22506ecdb4b0d62cadd (patch) | |
tree | b224ab4aa2350b233da640f5850f48bc6bfeb2d0 /Documentation/core-api/local_ops.rst | |
parent | ARM: dts: Add remote-wakeup-connected for omap OHCI (diff) | |
parent | ARM: dts: am437x-cm-t43: Correct the dmas property of spi0 (diff) | |
download | linux-dev-bc686442f8a601bccac1f22506ecdb4b0d62cadd.tar.xz linux-dev-bc686442f8a601bccac1f22506ecdb4b0d62cadd.zip |
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'Documentation/core-api/local_ops.rst')
-rw-r--r-- | Documentation/core-api/local_ops.rst | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Documentation/core-api/local_ops.rst b/Documentation/core-api/local_ops.rst index 1062ddba62c7..2ac3f9f29845 100644 --- a/Documentation/core-api/local_ops.rst +++ b/Documentation/core-api/local_ops.rst @@ -177,18 +177,14 @@ Here is a sample module which implements a basic per cpu counter using printk("Read : CPU %d, count %ld\n", cpu, local_read(&per_cpu(counters, cpu))); } - del_timer(&test_timer); - test_timer.expires = jiffies + 1000; - add_timer(&test_timer); + mod_timer(&test_timer, jiffies + 1000); } static int __init test_init(void) { /* initialize the timer that will increment the counter */ - init_timer(&test_timer); - test_timer.function = do_test_timer; - test_timer.expires = jiffies + 1; - add_timer(&test_timer); + timer_setup(&test_timer, do_test_timer, 0); + mod_timer(&test_timer, jiffies + 1); return 0; } |