aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/hpet.c
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@infradead.org>2010-10-26 17:22:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 19:52:11 -0400
commit0ca01763a028d0034042a9397534bc1f27848652 (patch)
tree2b055b87fa4ce314e9deb008e0ba1d1b6954f9e8 /drivers/char/hpet.c
parent96e9694df446d1154ec2f4fdba8908588b9cba38 (diff)
hpet: fix style problems
Fix the following style problems: WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h> WARNING: Use #include <linux/io.h> instead of <asm/io.h> ERROR: code indent should use tabs where possible ERROR: do not initialise statics to 0 or NULL Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/hpet.c')
-rw-r--r--drivers/char/hpet.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index a2cbb828e92a..fcb5f0d6ce70 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -32,12 +32,12 @@
32#include <linux/bitops.h> 32#include <linux/bitops.h>
33#include <linux/compat.h> 33#include <linux/compat.h>
34#include <linux/clocksource.h> 34#include <linux/clocksource.h>
35#include <linux/uaccess.h>
35#include <linux/slab.h> 36#include <linux/slab.h>
37#include <linux/io.h>
36 38
37#include <asm/current.h> 39#include <asm/current.h>
38#include <asm/uaccess.h>
39#include <asm/system.h> 40#include <asm/system.h>
40#include <asm/io.h>
41#include <asm/irq.h> 41#include <asm/irq.h>
42#include <asm/div64.h> 42#include <asm/div64.h>
43 43
@@ -81,13 +81,13 @@ static cycle_t read_hpet(struct clocksource *cs)
81} 81}
82 82
83static struct clocksource clocksource_hpet = { 83static struct clocksource clocksource_hpet = {
84 .name = "hpet", 84 .name = "hpet",
85 .rating = 250, 85 .rating = 250,
86 .read = read_hpet, 86 .read = read_hpet,
87 .mask = CLOCKSOURCE_MASK(64), 87 .mask = CLOCKSOURCE_MASK(64),
88 .mult = 0, /* to be calculated */ 88 .mult = 0, /* to be calculated */
89 .shift = 10, 89 .shift = 10,
90 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 90 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
91}; 91};
92static struct clocksource *hpet_clocksource; 92static struct clocksource *hpet_clocksource;
93#endif 93#endif
@@ -826,7 +826,7 @@ int hpet_alloc(struct hpet_data *hdp)
826 struct hpets *hpetp; 826 struct hpets *hpetp;
827 size_t siz; 827 size_t siz;
828 struct hpet __iomem *hpet; 828 struct hpet __iomem *hpet;
829 static struct hpets *last = NULL; 829 static struct hpets *last;
830 unsigned long period; 830 unsigned long period;
831 unsigned long long temp; 831 unsigned long long temp;
832 u32 remainder; 832 u32 remainder;