Commit 3ef4c758 authored by Chris Wilson's avatar Chris Wilson Committed by Linus Torvalds

[PATCH] cli_sti in drivers_net_irda_sa1100_ir.c

  As part of the Linux Kernel Janitors project, I would like to submit my
  patch for sa1100_ir.c.

  The document Documentation/cli-sti-removal.txt says that cli() should no
  longer be used to disable interrupts. This patch removes the last
  references to cli() and {save,restore}_flags, changing them to
  local_irq_save and local_irq_restore respectively.
parent 036c90dc
...@@ -189,8 +189,7 @@ static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed) ...@@ -189,8 +189,7 @@ static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed)
break; break;
case 4000000: case 4000000:
save_flags(flags); local_irq_save(flags);
cli();
si->hscr0 = 0; si->hscr0 = 0;
...@@ -210,7 +209,7 @@ static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed) ...@@ -210,7 +209,7 @@ static int sa1100_irda_set_speed(struct sa1100_irda *si, int speed)
sa1100_irda_rx_alloc(si); sa1100_irda_rx_alloc(si);
sa1100_irda_rx_dma_start(si); sa1100_irda_rx_dma_start(si);
restore_flags(flags); local_irq_restore(flags);
break; break;
......
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