diff options
| author | Robert Picco <robert.picco@hp.com> | 2004-06-29 05:18:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-29 05:18:44 -0700 |
| commit | 7f93b631ec79c6a1fd7cf081467eaff8a780edbd (patch) | |
| tree | ab5689da95e9ab65f92d08d0ebc5834fb9f79c8c /include/linux/hpet.h | |
| parent | f02c3bc485a7ccba42acb8c1dd63db3ea1bf632f (diff) | |
[PATCH] hpet fixes
Some hpet clean up and a fix to the RTC request_irq issue.
Signed-off-by: Bob Picco <Robert.Picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/hpet.h')
| -rw-r--r-- | include/linux/hpet.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/hpet.h b/include/linux/hpet.h index 6b7fb6208f8c..af4da7d302d8 100644 --- a/include/linux/hpet.h +++ b/include/linux/hpet.h @@ -54,12 +54,6 @@ struct hpet { #define HPET_LEG_RT_CNF_MASK (2UL) #define HPET_ENABLE_CNF_MASK (1UL) -/* - * HPET interrupt status register - */ - -#define HPET_ISR_CLEAR(HPET, TIMER) \ - (HPET)->hpet_isr |= (1UL << TIMER) /* * Timer configuration register @@ -115,8 +109,6 @@ struct hpet_task { void *ht_opaque; }; -#define HD_STATE(HD, TIMER) (HD)->hd_state |= (1 << TIMER) - struct hpet_data { unsigned long hd_address; unsigned short hd_nirqs; @@ -127,6 +119,12 @@ struct hpet_data { #define HPET_DATA_PLATFORM 0x0001 /* platform call to hpet_alloc */ +static inline void hpet_reserve_timer(struct hpet_data *hd, int timer) +{ + hd->hd_state |= (1 << timer); + return; +} + int hpet_alloc(struct hpet_data *); int hpet_register(struct hpet_task *, int); int hpet_unregister(struct hpet_task *); |