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>

4 files changed, 76 insertions, 76 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index dc07ed08b37..ca1c1f9debd 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -349,13 +349,13 @@ inline void portmux_setup(unsigned short per)
 void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
 { \
         unsigned long flags; \
-        local_irq_save_hw(flags); \
+        flags = hard_local_irq_save(); \
         if (arg) \
                 gpio_array[gpio_bank(gpio)]->name |= gpio_bit(gpio); \
         else \
                 gpio_array[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \
         AWA_DUMMY_READ(name); \
-        local_irq_restore_hw(flags); \
+        hard_local_irq_restore(flags); \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
 
@@ -371,14 +371,14 @@ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
 { \
         unsigned long flags; \
         if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
         if (arg) \
                 gpio_array[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
         else \
                 gpio_array[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
         if (ANOMALY_05000311 || ANOMALY_05000323) { \
                 AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
         } \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
@@ -391,11 +391,11 @@ void set_gpio_toggle(unsigned gpio)
 {
         unsigned long flags;
         if (ANOMALY_05000311 || ANOMALY_05000323)
-                local_irq_save_hw(flags);
+                flags = hard_local_irq_save();
         gpio_array[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
         if (ANOMALY_05000311 || ANOMALY_05000323) {
                 AWA_DUMMY_READ(toggle);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
         }
 }
 EXPORT_SYMBOL(set_gpio_toggle);
@@ -408,11 +408,11 @@ void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \
 { \
         unsigned long flags; \
         if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
         gpio_array[gpio_bank(gpio)]->name = arg; \
         if (ANOMALY_05000311 || ANOMALY_05000323) { \
                 AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
         } \
 } \
 EXPORT_SYMBOL(set_gpiop_ ## name);
@@ -433,11 +433,11 @@ unsigned short get_gpio_ ## name(unsigned gpio) \
         unsigned long flags; \
         unsigned short ret; \
         if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
         ret = 0x01 & (gpio_array[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \
         if (ANOMALY_05000311 || ANOMALY_05000323) { \
                 AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
         } \
         return ret; \
 } \
@@ -460,11 +460,11 @@ unsigned short get_gpiop_ ## name(unsigned gpio) \
         unsigned long flags; \
         unsigned short ret; \
         if (ANOMALY_05000311 || ANOMALY_05000323) \
-                local_irq_save_hw(flags); \
+                flags = hard_local_irq_save(); \
         ret = (gpio_array[gpio_bank(gpio)]->name); \
         if (ANOMALY_05000311 || ANOMALY_05000323) { \
                 AWA_DUMMY_READ(name); \
-                local_irq_restore_hw(flags); \
+                hard_local_irq_restore(flags); \
         } \
         return ret; \
 } \
@@ -525,14 +525,14 @@ int gpio_pm_wakeup_ctrl(unsigned gpio, unsigned ctrl)
         if (check_gpio(gpio) < 0)
                 return -EINVAL;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         if (ctrl)
                 reserve(wakeup, gpio);
         else
                 unreserve(wakeup, gpio);
 
         set_gpio_maskb(gpio, ctrl);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return 0;
 }
@@ -690,7 +690,7 @@ int peripheral_request(unsigned short per, const char *label)
 
         BUG_ON(ident >= MAX_RESOURCES);
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         /* If a pin can be muxed as either GPIO or peripheral, make
          * sure it is not already a GPIO pin when we request it.
@@ -701,7 +701,7 @@ int peripheral_request(unsigned short per, const char *label)
                 printk(KERN_ERR
                        "%s: Peripheral %d is already reserved as GPIO by %s !\n",
                        __func__, ident, get_label(ident));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return -EBUSY;
         }
 
@@ -730,7 +730,7 @@ int peripheral_request(unsigned short per, const char *label)
                         printk(KERN_ERR
                                "%s: Peripheral %d function %d is already reserved by %s !\n",
                                __func__, ident, P_FUNCT2MUX(per), get_label(ident));
-                        local_irq_restore_hw(flags);
+                        hard_local_irq_restore(flags);
                         return -EBUSY;
                 }
         }
@@ -741,7 +741,7 @@ int peripheral_request(unsigned short per, const char *label)
         portmux_setup(per);
         port_setup(ident, PERIPHERAL_USAGE);
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
         set_label(ident, label);
 
         return 0;
@@ -780,10 +780,10 @@ void peripheral_free(unsigned short per)
         if (!(per & P_DEFINED))
                 return;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (unlikely(!is_reserved(peri, ident, 0))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return;
         }
 
@@ -794,7 +794,7 @@ void peripheral_free(unsigned short per)
 
         set_label(ident, "free");
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(peripheral_free);
 
@@ -828,7 +828,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
         if (check_gpio(gpio) < 0)
                 return -EINVAL;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         /*
          * Allow that the identical GPIO can
@@ -837,7 +837,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
          */
 
         if (cmp_label(gpio, label) == 0) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return 0;
         }
 
@@ -846,7 +846,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
                         dump_stack();
                 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
                        gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return -EBUSY;
         }
         if (unlikely(is_reserved(peri, gpio, 1))) {
@@ -855,7 +855,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
                 printk(KERN_ERR
                        "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                        gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return -EBUSY;
         }
         if (unlikely(is_reserved(gpio_irq, gpio, 1))) {
@@ -871,7 +871,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
         reserve(gpio, gpio);
         set_label(gpio, label);
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         port_setup(gpio, GPIO_USAGE);
 
@@ -888,13 +888,13 @@ void bfin_gpio_free(unsigned gpio)
 
         might_sleep();
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (unlikely(!is_reserved(gpio, gpio, 0))) {
                 if (system_state == SYSTEM_BOOTING)
                         dump_stack();
                 gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return;
         }
 
@@ -902,7 +902,7 @@ void bfin_gpio_free(unsigned gpio)
 
         set_label(gpio, "free");
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(bfin_gpio_free);
 
@@ -913,7 +913,7 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
 {
         unsigned long flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         /*
          * Allow that the identical GPIO can
@@ -922,19 +922,19 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
          */
 
         if (cmp_label(gpio, label) == 0) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return 0;
         }
 
         if (unlikely(is_reserved(special_gpio, gpio, 1))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
                        gpio, get_label(gpio));
 
                 return -EBUSY;
         }
         if (unlikely(is_reserved(peri, gpio, 1))) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 printk(KERN_ERR
                        "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                        gpio, get_label(gpio));
@@ -946,7 +946,7 @@ int bfin_special_gpio_request(unsigned gpio, const char *label)
         reserve(peri, gpio);
 
         set_label(gpio, label);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
         port_setup(gpio, GPIO_USAGE);
 
         return 0;
@@ -959,18 +959,18 @@ void bfin_special_gpio_free(unsigned gpio)
 
         might_sleep();
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (unlikely(!is_reserved(special_gpio, gpio, 0))) {
                 gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return;
         }
 
         unreserve(special_gpio, gpio);
         unreserve(peri, gpio);
         set_label(gpio, "free");
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(bfin_special_gpio_free);
 #endif
@@ -983,7 +983,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
         if (check_gpio(gpio) < 0)
                 return -EINVAL;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (unlikely(is_reserved(peri, gpio, 1))) {
                 if (system_state == SYSTEM_BOOTING)
@@ -991,7 +991,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
                 printk(KERN_ERR
                        "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
                        gpio, get_label(gpio));
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return -EBUSY;
         }
         if (unlikely(is_reserved(gpio, gpio, 1)))
@@ -1002,7 +1002,7 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label)
         reserve(gpio_irq, gpio);
         set_label(gpio, label);
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         port_setup(gpio, GPIO_USAGE);
 
@@ -1016,13 +1016,13 @@ void bfin_gpio_irq_free(unsigned gpio)
         if (check_gpio(gpio) < 0)
                 return;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (unlikely(!is_reserved(gpio_irq, gpio, 0))) {
                 if (system_state == SYSTEM_BOOTING)
                         dump_stack();
                 gpio_error(gpio);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return;
         }
 
@@ -1030,7 +1030,7 @@ void bfin_gpio_irq_free(unsigned gpio)
 
         set_label(gpio, "free");
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 static inline void __bfin_gpio_direction_input(unsigned gpio)
@@ -1052,10 +1052,10 @@ int bfin_gpio_direction_input(unsigned gpio)
                 return -EINVAL;
         }
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         __bfin_gpio_direction_input(gpio);
         AWA_DUMMY_READ(inen);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return 0;
 }
@@ -1070,9 +1070,9 @@ void bfin_gpio_irq_prepare(unsigned gpio)
         port_setup(gpio, GPIO_USAGE);
 
 #ifdef CONFIG_BF54x
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         __bfin_gpio_direction_input(gpio);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 #endif
 }
 
@@ -1094,7 +1094,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
                 return -EINVAL;
         }
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
         gpio_set_value(gpio, value);
@@ -1105,7 +1105,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
 #endif
 
         AWA_DUMMY_READ(dir);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return 0;
 }
@@ -1120,11 +1120,11 @@ int bfin_gpio_get_value(unsigned gpio)
 
         if (unlikely(get_gpio_edge(gpio))) {
                 int ret;
-                local_irq_save_hw(flags);
+                flags = hard_local_irq_save();
                 set_gpio_edge(gpio, 0);
                 ret = get_gpio_data(gpio);
                 set_gpio_edge(gpio, 1);
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return ret;
         } else
                 return get_gpio_data(gpio);
diff --git a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
index 87b25b1b30e..8de92299b3e 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbmgr.c
@@ -318,7 +318,7 @@ void flush_switched_cplbs(unsigned int cpu)
 
         nr_cplb_flush[cpu]++;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         _disable_icplb();
         for (i = first_switched_icplb; i < MAX_CPLBS; i++) {
                 icplb_tbl[cpu][i].data = 0;
@@ -332,7 +332,7 @@ void flush_switched_cplbs(unsigned int cpu)
                 bfin_write32(DCPLB_DATA0 + i * 4, 0);
         }
         _enable_dcplb();
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
 }
 
@@ -348,7 +348,7 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
                 return;
         }
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         current_rwx_mask[cpu] = masks;
 
         if (L2_LENGTH && addr >= L2_START && addr < L2_START + L2_LENGTH) {
@@ -373,5 +373,5 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)
                 addr += PAGE_SIZE;
         }
         _enable_dcplb();
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index 1a496cd71ba..3b1da4aff2a 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -219,10 +219,10 @@ int __ipipe_syscall_root(struct pt_regs *regs)
 
         ret = __ipipe_dispatch_event(IPIPE_EVENT_SYSCALL, regs);
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (!__ipipe_root_domain_p) {
-                local_irq_restore_hw(flags);
+                hard_local_irq_restore(flags);
                 return 1;
         }
 
@@ -230,7 +230,7 @@ int __ipipe_syscall_root(struct pt_regs *regs)
         if ((p->irqpend_himask & IPIPE_IRQMASK_VIRT) != 0)
                 __ipipe_sync_pipeline(IPIPE_IRQMASK_VIRT);
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return -ret;
 }
@@ -239,14 +239,14 @@ unsigned long ipipe_critical_enter(void (*syncfn) (void))
 {
         unsigned long flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         return flags;
 }
 
 void ipipe_critical_exit(unsigned long flags)
 {
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 static void __ipipe_no_irqtail(void)
@@ -279,9 +279,9 @@ int ipipe_trigger_irq(unsigned irq)
                 return -EINVAL;
 #endif
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         __ipipe_handle_irq(irq, NULL);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return 1;
 }
@@ -293,7 +293,7 @@ asmlinkage void __ipipe_sync_root(void)
 
         BUG_ON(irqs_disabled());
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
 
         if (irq_tail_hook)
                 irq_tail_hook();
@@ -303,7 +303,7 @@ asmlinkage void __ipipe_sync_root(void)
         if (ipipe_root_cpudom_var(irqpend_himask) != 0)
                 __ipipe_sync_pipeline(IPIPE_IRQMASK_ANY);
 
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 
 void ___ipipe_sync_pipeline(unsigned long syncmask)
@@ -344,10 +344,10 @@ void __ipipe_stall_root(void)
 {
         unsigned long *p, flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         p = &__ipipe_root_status;
         __set_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_stall_root);
 
@@ -356,10 +356,10 @@ unsigned long __ipipe_test_and_stall_root(void)
         unsigned long *p, flags;
         int x;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         p = &__ipipe_root_status;
         x = __test_and_set_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 
         return x;
 }
@@ -371,10 +371,10 @@ unsigned long __ipipe_test_root(void)
         unsigned long flags;
         int x;
 
-        local_irq_save_hw_smp(flags);
+        flags = hard_local_irq_save_smp();
         p = &__ipipe_root_status;
         x = test_bit(IPIPE_STALL_FLAG, p);
-        local_irq_restore_hw_smp(flags);
+        hard_local_irq_restore_smp(flags);
 
         return x;
 }
@@ -384,10 +384,10 @@ void __ipipe_lock_root(void)
 {
         unsigned long *p, flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         p = &__ipipe_root_status;
         __set_bit(IPIPE_SYNCDEFER_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_lock_root);
 
@@ -395,9 +395,9 @@ void __ipipe_unlock_root(void)
 {
         unsigned long *p, flags;
 
-        local_irq_save_hw(flags);
+        flags = hard_local_irq_save();
         p = &__ipipe_root_status;
         __clear_bit(IPIPE_SYNCDEFER_FLAG, p);
-        local_irq_restore_hw(flags);
+        hard_local_irq_restore(flags);
 }
 EXPORT_SYMBOL(__ipipe_unlock_root);
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 01f98cb964d..c86a3ed5f48 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -65,11 +65,11 @@ static void default_idle(void)
 #ifdef CONFIG_IPIPE
         ipipe_suspend_domain();
 #endif
-        local_irq_disable_hw();
+        hard_local_irq_disable();
         if (!need_resched())
                 idle_with_irq_disabled();
 
-        local_irq_enable_hw();
+        hard_local_irq_enable();
 }
 
 /*