[PATCH] ep7211: remove sti()/cli() From: David chosrova Convert sti/cli... usage to accepted locking primitives. Signed-off-by: David chosrova Signed-off-by: Alexey Dobriyan Index: linux-kj/drivers/net/irda/ep7211_ir.c =================================================================== --- linux-kj.orig/drivers/net/irda/ep7211_ir.c 2006-01-18 02:22:00.000000000 +0300 +++ linux-kj/drivers/net/irda/ep7211_ir.c 2006-01-18 16:43:28.000000000 +0300 @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -23,6 +24,7 @@ static void ep7211_ir_close(dongle_t *se static int ep7211_ir_change_speed(struct irda_task *task); static int ep7211_ir_reset(struct irda_task *task); +static spinlock_t driver_lock; static struct dongle_reg dongle = { .type = IRDA_EP7211_IR, .open = ep7211_ir_open, @@ -36,7 +38,7 @@ static void ep7211_ir_open(dongle_t *sel { unsigned int syscon1, flags; - save_flags(flags); cli(); + spin_lock_irqsave(&driver_lock, flags); /* Turn on the SIR encoder. */ syscon1 = clps_readl(SYSCON1); @@ -46,14 +48,14 @@ static void ep7211_ir_open(dongle_t *sel /* XXX: We should disable modem status interrupts on the first UART (interrupt #14). */ - restore_flags(flags); + spin_unlock_irqrestore(&driver_lock, flags); } static void ep7211_ir_close(dongle_t *self) { unsigned int syscon1, flags; - save_flags(flags); cli(); + spin_lock_irqsave(&driver_lock, flags); /* Turn off the SIR encoder. */ syscon1 = clps_readl(SYSCON1); @@ -63,7 +65,7 @@ static void ep7211_ir_close(dongle_t *se /* XXX: If we've disabled the modem status interrupts, we should reset them back to their original state. */ - restore_flags(flags); + spin_unlock_irqrestore(&driver_lock, flags); } /* @@ -99,6 +101,7 @@ static int ep7211_ir_reset(struct irda_t */ static int __init ep7211_ir_init(void) { + spin_lock_init(&driver_lock); return irda_device_register_dongle(&dongle); }