Blackfin: Rename IRQ flags handling functions

Rename h/w IRQ flags handling functions to be in line with what is expected for
the irq renaming patch.  This renames local_*_hw() to hard_local_*() using the
following perl command:

	perl -pi -e 's/local_irq_(restore|enable|disable)_hw/hard_local_irq_\1/ or s/local_irq_save_hw([_a-z]*)[(]flags[)]/flags = hard_local_irq_save\1()/' `find arch/blackfin/ -name "*.[ch]"`

and then fixing up asm/irqflags.h manually.

Additionally, arch/hard_local_save_flags() and arch/hard_local_irq_save() both
return the flags rather than passing it through the argument list.

Signed-off-by: David Howells <dhowells@redhat.com>

3 files changed, 19 insertions, 19 deletions

diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
index 4391d03dc845..f4cf11d362e1 100644
--- a/arch/blackfin/mach-common/cpufreq.c
+++ b/arch/blackfin/mach-common/cpufreq.c
@@ -134,7 +134,7 @@ static int bfin_target(struct cpufreq_policy *poli,
 
                 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
                 if (cpu == CPUFREQ_CPU) {
-                        local_irq_save_hw(flags);
+                        flags = hard_local_irq_save();
                         plldiv = (bfin_read_PLL_DIV() & SSEL) |
                                                 dpm_state_table[index].csel;
                         bfin_write_PLL_DIV(plldiv);
@@ -155,7 +155,7 @@ static int bfin_target(struct cpufreq_policy *poli,
                                 loops_per_jiffy = cpufreq_scale(lpj_ref,
                                                 lpj_ref_freq, freqs.new);
                         }
-                        local_irq_restore_hw(flags);
+                        hard_local_irq_restore(flags);
                 }
                 /* TODO: just test case for cycles clock source, remove later */
                 cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 1c8c4c7245c3..eaece5f84e42 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -132,8 +132,8 @@ static void bfin_ack_noop(unsigned int irq)
 static void bfin_core_mask_irq(unsigned int irq)
 {
         bfin_irq_flags &= ~(1 << irq);
-        if (!irqs_disabled_hw())
-                local_irq_enable_hw();
+        if (!hard_irqs_disabled())
+                hard_local_irq_enable();
 }
 
 static void bfin_core_unmask_irq(unsigned int irq)
@@ -148,8 +148,8 @@ static void bfin_core_unmask_irq(unsigned int irq)
          * local_irq_enable just does "STI bfin_irq_flags", so it's exactly
          * what we need.
          */
-        if (!irqs_disabled_hw())
-                local_irq_enable_hw();
+        if (!hard_irqs_disabled())
+                hard_local_irq_enable();
         return;
 }
 
@@ -158,12 +158,12 @@ static void bfin_internal_mask_irq(unsigned int irq)
         unsigned long flags;
 
 #ifdef CONFIG_BF53x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
                              ~(1 << SIC_SYSIRQ(irq)));
 #else
         unsigned mask_bank, mask_bit;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         mask_bank = SIC_SYSIRQ(irq) / 32;
         mask_bit = SIC_SYSIRQ(irq) % 32;
         bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
@@ -173,7 +173,7 @@ static void bfin_internal_mask_irq(unsigned int irq)
                              ~(1 << mask_bit));
 #endif
 #endif
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 #ifdef CONFIG_SMP
@@ -186,12 +186,12 @@ static void bfin_internal_unmask_irq(unsigned int irq)
         unsigned long flags;
 
 #ifdef CONFIG_BF53x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
                              (1 << SIC_SYSIRQ(irq)));
 #else
         unsigned mask_bank, mask_bit;
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         mask_bank = SIC_SYSIRQ(irq) / 32;
         mask_bit = SIC_SYSIRQ(irq) % 32;
 #ifdef CONFIG_SMP
@@ -207,7 +207,7 @@ static void bfin_internal_unmask_irq(unsigned int irq)
                         (1 << mask_bit));
 #endif
 #endif
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 #ifdef CONFIG_SMP
@@ -264,7 +264,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
         break;
         }
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (state) {
                 bfin_sic_iwr[bank] |= (1 << bit);
@@ -275,7 +275,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state)
                 vr_wakeup  &= ~wakeup;
         }
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return 0;
 }
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 09c1fb410748..80884b136a0c 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -25,7 +25,7 @@ void bfin_pm_suspend_standby_enter(void)
 {
         unsigned long flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         bfin_pm_standby_setup();
 
 #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
@@ -56,7 +56,7 @@ void bfin_pm_suspend_standby_enter(void)
         bfin_write_SIC_IWR(IWR_DISABLE_ALL);
 #endif
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 int bf53x_suspend_l1_mem(unsigned char *memptr)
@@ -149,12 +149,12 @@ int bfin_pm_suspend_mem_enter(void)
         wakeup |= GPWE;
 #endif
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         ret = blackfin_dma_suspend();
 
         if (ret) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 kfree(memptr);
                 return ret;
         }
@@ -178,7 +178,7 @@ int bfin_pm_suspend_mem_enter(void)
         bfin_gpio_pm_hibernate_restore();
         blackfin_dma_resume();
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
         kfree(memptr);
 
         return 0;