aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_marvel.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha/kernel/sys_marvel.c')
-rw-r--r--arch/alpha/kernel/sys_marvel.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 922143ea1cdb..828449cd2636 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -80,7 +80,7 @@ io7_get_irq_ctl(unsigned int irq, struct io7 **pio7)
80 if (!(io7 = marvel_find_io7(pid))) { 80 if (!(io7 = marvel_find_io7(pid))) {
81 printk(KERN_ERR 81 printk(KERN_ERR
82 "%s for nonexistent io7 -- vec %x, pid %d\n", 82 "%s for nonexistent io7 -- vec %x, pid %d\n",
83 __FUNCTION__, irq, pid); 83 __func__, irq, pid);
84 return NULL; 84 return NULL;
85 } 85 }
86 86
@@ -90,7 +90,7 @@ io7_get_irq_ctl(unsigned int irq, struct io7 **pio7)
90 if (irq >= 0x180) { 90 if (irq >= 0x180) {
91 printk(KERN_ERR 91 printk(KERN_ERR
92 "%s for invalid irq -- pid %d adjusted irq %x\n", 92 "%s for invalid irq -- pid %d adjusted irq %x\n",
93 __FUNCTION__, pid, irq); 93 __func__, pid, irq);
94 return NULL; 94 return NULL;
95 } 95 }
96 96
@@ -110,8 +110,8 @@ io7_enable_irq(unsigned int irq)
110 110
111 ctl = io7_get_irq_ctl(irq, &io7); 111 ctl = io7_get_irq_ctl(irq, &io7);
112 if (!ctl || !io7) { 112 if (!ctl || !io7) {
113 printk(KERN_ERR "%s: get_ctl failed for irq %x\n", 113 printk(KERN_ERR "%s: get_ctl failed for irq %x\n",
114 __FUNCTION__, irq); 114 __func__, irq);
115 return; 115 return;
116 } 116 }
117 117
@@ -130,8 +130,8 @@ io7_disable_irq(unsigned int irq)
130 130
131 ctl = io7_get_irq_ctl(irq, &io7); 131 ctl = io7_get_irq_ctl(irq, &io7);
132 if (!ctl || !io7) { 132 if (!ctl || !io7) {
133 printk(KERN_ERR "%s: get_ctl failed for irq %x\n", 133 printk(KERN_ERR "%s: get_ctl failed for irq %x\n",
134 __FUNCTION__, irq); 134 __func__, irq);
135 return; 135 return;
136 } 136 }
137 137