GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-07 07:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[IRDA]: sti/cli removal from EP7211 IrDA driver

Browse source 
This patch replaces the deprecated sti/cli routines with the corresponding
spin_lock ones.

Signed-off-by: David chosrova <david.chosrova@libertysurf.fr>
Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David chosrova 2006-03-20 19:00:04 -08:00 • committed by David S. Miller
parent 0ed79c9b7d
commit 034888262e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/irda/ep7211_ir.c
View file

@ -8,6 +8,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h>
#include <net/irda/irda.h> #include <net/irda/irda.h>
#include <net/irda/irda_device.h> #include <net/irda/irda_device.h>
@ -23,6 +24,8 @@ static void ep7211_ir_close(dongle_t *self);
static int ep7211_ir_change_speed(struct irda_task *task); static int ep7211_ir_change_speed(struct irda_task *task);
static int ep7211_ir_reset(struct irda_task *task); static int ep7211_ir_reset(struct irda_task *task);
static DEFINE_SPINLOCK(ep7211_lock);
static struct dongle_reg dongle = { static struct dongle_reg dongle = {
.type = IRDA_EP7211_IR, .type = IRDA_EP7211_IR,
.open = ep7211_ir_open, .open = ep7211_ir_open,
@ -36,7 +39,7 @@ static void ep7211_ir_open(dongle_t *self, struct qos_info *qos)
{ {
unsigned int syscon1, flags; unsigned int syscon1, flags;
save_flags(flags); cli(); spin_lock_irqsave(&ep7211_lock, flags);
/* Turn on the SIR encoder. */ /* Turn on the SIR encoder. */
syscon1 = clps_readl(SYSCON1); syscon1 = clps_readl(SYSCON1);
@ -46,14 +49,14 @@ static void ep7211_ir_open(dongle_t *self, struct qos_info *qos)
/* XXX: We should disable modem status interrupts on the first /* XXX: We should disable modem status interrupts on the first
UART (interrupt #14). */ UART (interrupt #14). */
restore_flags(flags); spin_unlock_irqrestore(&ep7211_lock, flags);
} }
static void ep7211_ir_close(dongle_t *self) static void ep7211_ir_close(dongle_t *self)
{ {
unsigned int syscon1, flags; unsigned int syscon1, flags;
save_flags(flags); cli(); spin_lock_irqsave(&ep7211_lock, flags);
/* Turn off the SIR encoder. */ /* Turn off the SIR encoder. */
syscon1 = clps_readl(SYSCON1); syscon1 = clps_readl(SYSCON1);
@ -63,7 +66,7 @@ static void ep7211_ir_close(dongle_t *self)
/* XXX: If we've disabled the modem status interrupts, we should /* XXX: If we've disabled the modem status interrupts, we should
reset them back to their original state. */ reset them back to their original state. */
restore_flags(flags); spin_unlock_irqrestore(&ep7211_lock, flags);
} }
/* /*