mach-ixp2000: remove cli()/sti()
Subsystems (2)
PATCH 1/1 mach-ixp2000: remove cli()/sti()
Replace to-be-deprecated functions in arch/arm/mach-ixp2000/pci.c
Signed-off-by James Nelson <[email protected]>
arch/arm/mach-ixp2000/pci.c +4 -4
@@ -145,7 +145,7 @@ pci_master_aborts =1 ; -cli (); +local_irq_disable (); temp = *(IXP2000_PCI_CONTROL );if (temp & ((1 <<8 ) | (1 <<5 ))) {ixp2000_reg_write (IXP2000_PCI_CONTROL , temp);
@@ -158,7 +158,7 @@ temp = *(IXP2000_PCI_CMDSTAT ); } } -sti (); +local_irq_enable ();/* * If it was an imprecise abort, then we need to correct the
@@ -175,7 +175,7 @@ {volatile u32 temp; -cli (); +local_irq_disable (); temp = *(IXP2000_PCI_CONTROL );if (temp & ((1 <<8 ) | (1 <<5 ))) {ixp2000_reg_write (IXP2000_PCI_CONTROL , temp);
@@ -188,7 +188,7 @@ temp = *(IXP2000_PCI_CMDSTAT ); } } -sti (); +local_irq_enable ();return 0 ; }