@@ -277,7 +277,7 @@
inc_parport_count();
port->ops->inc_use_count();
- init_waitqueue(&tmp->wait_q);
+ init_waitqueue_head(&tmp->wait_q);
tmp->timeslice = PARPORT_DEFAULT_TIMESLICE;
tmp->waitnext = tmp->waitprev = NULL;
@@ -2834,7 +2834,7 @@
ppp->magic = PPP_MAGIC;
ppp->next = NULL;
ppp->inuse = 1;
- ppp->read_wait = NULL;
+ init_waitqueue_head(&ppp->read_wait);
/*
* Make up a suitable name for this device
@@ -109,7 +109,7 @@
__u16 rfcs; /* FCS so far of rpkt */
/* Queues for select() functionality */
- struct wait_queue *read_wait; /* queue for reading processes */
+ wait_queue_head_t read_wait; /* queue for reading processes */
/* info for detecting idle channels */
unsigned long last_xmit; /* time of last transmission */
@@ -163,7 +163,7 @@
struct pardevice *next;
struct pardevice *prev;
struct parport_state *state; /* saved status over preemption */
- struct wait_queue *wait_q;
+ wait_queue_head_t wait_q;
unsigned long int time;
unsigned long int timeslice;
unsigned int waiting;