IrDA: sti/cli removal from EP7211 IrDA driver
Subsystems (2)
PATCH 4/5 IrDA: sti/cli removal from EP7211 IrDA driver
This patch replaces the deprecated sti/cli routines with the corresponding spin_lock ones.
drivers/net/irda/ep7211_ir.c +7 -4
@@ -8,6 +8,7 @@#include <linux/delay.h> #include <linux/tty.h> #include <linux/init.h> +#include <linux/spinlock.h> #include <net/irda/irda.h> #include <net/irda/irda_device.h>
@@ -23,6 +24,8 @@ static void ep7211_ir_close(dongle_t *sestatic int ep7211_ir_change_speed (struct irda_task *task);static int ep7211_ir_reset (struct irda_task *task); +static DEFINE_SPINLOCK (ep7211_lock); +static struct dongle_reg dongle = { .type =IRDA_EP7211_IR , .open = ep7211_ir_open,
@@ -36,7 +39,7 @@ static void ep7211_ir_open(dongle_t *sel {unsigned int syscon1, flags; -save_flags (flags);cli (); +spin_lock_irqsave (&ep7211_lock, flags);/* Turn on the SIR encoder. */ syscon1 =clps_readl (SYSCON1 );
@@ -46,14 +49,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 (&ep7211_lock, flags); }static void ep7211_ir_close (dongle_t *self) {unsigned int syscon1, flags; -save_flags (flags);cli (); +spin_lock_irqsave (&ep7211_lock, flags);/* Turn off the SIR encoder. */ syscon1 =clps_readl (SYSCON1 );
@@ -63,7 +66,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 (&ep7211_lock, flags); }/*
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
David S. Miller
AppliedFrom: Samuel Ortiz <[email protected]>
Date: Tue, 14 Feb 2006 00:15:38 +0200
Quoted 5 lines
This patch replaces the deprecated sti/cli routines with the corresponding
spin_lockones.Signed-off-by David chosrova <[email protected]>Signed-off-by Samuel Ortiz <[email protected]>
Applied.
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642