leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SPARC]: bpp: remove sleep_on usage

Browse Source 
Use schedule_timeout() instead of sleep_on + timer.  Totally untested
due to lack of hardware, but the changes are rather trivial.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2005-07-04 13:24:14 -07:00 committed by David S. Miller
parent e7270dec08
commit 06326e40b7
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/sbus/char/bpp.c
View File

@ -79,10 +79,6 @@ struct inst {
unsigned char run_length; unsigned char run_length;
unsigned char repeat_byte; unsigned char repeat_byte;
/* These members manage timeouts for programmed delays */
wait_queue_head_t wait_queue;
struct timer_list timer_list;
}; };
static struct inst instances[BPP_NO]; static struct inst instances[BPP_NO];
@ -297,16 +293,10 @@ static unsigned short get_pins(unsigned minor)
#endif /* __sparc__ */ #endif /* __sparc__ */
static void bpp_wake_up(unsigned long val)
{ wake_up(&instances[val].wait_queue); }
static void snooze(unsigned long snooze_time, unsigned minor) static void snooze(unsigned long snooze_time, unsigned minor)
{ {
init_timer(&instances[minor].timer_list); set_current_state(TASK_UNINTERRUPTIBLE);
instances[minor].timer_list.expires = jiffies + snooze_time + 1; schedule_timeout(snooze_time + 1);
instances[minor].timer_list.data = minor;
add_timer(&instances[minor].timer_list);
sleep_on (&instances[minor].wait_queue);
} }
static int wait_for(unsigned short set, unsigned short clr, static int wait_for(unsigned short set, unsigned short clr,
@ -880,11 +870,8 @@ static void probeLptPort(unsigned idx)
instances[idx].enhanced = 0; instances[idx].enhanced = 0;
instances[idx].direction = 0; instances[idx].direction = 0;
instances[idx].mode = COMPATIBILITY; instances[idx].mode = COMPATIBILITY;
instances[idx].wait_queue = 0;
instances[idx].run_length = 0; instances[idx].run_length = 0;
instances[idx].run_flag = 0; instances[idx].run_flag = 0;
init_timer(&instances[idx].timer_list);
instances[idx].timer_list.function = bpp_wake_up;
if (!request_region(lpAddr,3, dev_name)) return; if (!request_region(lpAddr,3, dev_name)) return;
/* /*
@ -977,11 +964,8 @@ static void probeLptPort(unsigned idx)
instances[idx].enhanced = 0; instances[idx].enhanced = 0;
instances[idx].direction = 0; instances[idx].direction = 0;
instances[idx].mode = COMPATIBILITY; instances[idx].mode = COMPATIBILITY;
init_waitqueue_head(&instances[idx].wait_queue);
instances[idx].run_length = 0; instances[idx].run_length = 0;
instances[idx].run_flag = 0; instances[idx].run_flag = 0;
init_timer(&instances[idx].timer_list);
instances[idx].timer_list.function = bpp_wake_up;
if (!rp) return; if (!rp) return;