Commit da53d0dc authored by Thomas Gleixner's avatar Thomas Gleixner

parport: convert to anon_semaphore

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7082c040
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* It will be useful to call this from an interrupt handler. */ * It will be useful to call this from an interrupt handler. */
static void parport_ieee1284_wakeup (struct parport *port) static void parport_ieee1284_wakeup (struct parport *port)
{ {
up (&port->physport->ieee1284.irq); anon_up (&port->physport->ieee1284.irq);
} }
static struct parport *port_from_cookie[PARPORT_MAX]; static struct parport *port_from_cookie[PARPORT_MAX];
...@@ -83,7 +83,7 @@ int parport_wait_event (struct parport *port, signed long timeout) ...@@ -83,7 +83,7 @@ int parport_wait_event (struct parport *port, signed long timeout)
timer.data = port->number; timer.data = port->number;
add_timer (&timer); add_timer (&timer);
ret = down_interruptible (&port->physport->ieee1284.irq); ret = anon_down_interruptible (&port->physport->ieee1284.irq);
if (!del_timer_sync(&timer) && !ret) if (!del_timer_sync(&timer) && !ret)
/* Timed out. */ /* Timed out. */
ret = 1; ret = 1;
......
...@@ -306,7 +306,7 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma, ...@@ -306,7 +306,7 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma,
spin_lock_init(&tmp->pardevice_lock); spin_lock_init(&tmp->pardevice_lock);
tmp->ieee1284.mode = IEEE1284_MODE_COMPAT; tmp->ieee1284.mode = IEEE1284_MODE_COMPAT;
tmp->ieee1284.phase = IEEE1284_PH_FWD_IDLE; tmp->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
semaphore_init_locked(&tmp->ieee1284.irq); anon_semaphore_init_locked(&tmp->ieee1284.irq);
tmp->spintime = parport_default_spintime; tmp->spintime = parport_default_spintime;
atomic_set (&tmp->ref_count, 1); atomic_set (&tmp->ref_count, 1);
INIT_LIST_HEAD(&tmp->full_list); INIT_LIST_HEAD(&tmp->full_list);
......
...@@ -264,7 +264,7 @@ enum ieee1284_phase { ...@@ -264,7 +264,7 @@ enum ieee1284_phase {
struct ieee1284_info { struct ieee1284_info {
int mode; int mode;
volatile enum ieee1284_phase phase; volatile enum ieee1284_phase phase;
struct semaphore irq; struct anon_semaphore irq;
}; };
/* A parallel port */ /* A parallel port */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment