Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6d20819f8050092d40e9c99c55d82c8e26d42599

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent 5fb55ae955
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] irq-flags: SH: Use the new IRQF_ constants 

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 13 changed files with 16 additions and 19 deletions Side-by-side Diff

arch/sh/boards/snapgear/setup.c
Diff comments   View file @ 6d20819
... ... @@ -50,7 +50,7 @@
50 50 {
51 51 printk("SnapGear: EraseConfig init\n");
52 52 /* Setup "EraseConfig" switch on external IRQ 0 */
53   - if (request_irq(IRL0_IRQ, eraseconfig_interrupt, SA_INTERRUPT,
  53 + if (request_irq(IRL0_IRQ, eraseconfig_interrupt, IRQF_DISABLED,
54 54 "Erase Config", NULL))
55 55 printk("SnapGear: failed to register IRQ%d for Reset witch\n",
56 56 IRL0_IRQ);
arch/sh/cchips/hd6446x/hd64461/setup.c
Diff comments   View file @ 6d20819
... ... @@ -133,7 +133,7 @@
133 133 return __irq_demux(irq);
134 134 }
135 135  
136   -static struct irqaction irq0 = { hd64461_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64461", NULL, NULL };
  136 +static struct irqaction irq0 = { hd64461_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64461", NULL, NULL };
137 137  
138 138 int __init setup_hd64461(void)
139 139 {
arch/sh/cchips/hd6446x/hd64465/gpio.c
Diff comments   View file @ 6d20819
... ... @@ -170,7 +170,7 @@
170 170 if (!request_region(HD64465_REG_GPACR, 0x1000, MODNAME))
171 171 return -EBUSY;
172 172 if (request_irq(HD64465_IRQ_GPIO, hd64465_gpio_interrupt,
173   - SA_INTERRUPT, MODNAME, 0))
  173 + IRQF_DISABLED, MODNAME, 0))
174 174 goto out_irqfailed;
175 175  
176 176 printk("HD64465 GPIO layer on irq %d\n", HD64465_IRQ_GPIO);
arch/sh/cchips/hd6446x/hd64465/setup.c
Diff comments   View file @ 6d20819
... ... @@ -153,7 +153,7 @@
153 153 return irq;
154 154 }
155 155  
156   -static struct irqaction irq0 = { hd64465_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "HD64465", NULL, NULL};
  156 +static struct irqaction irq0 = { hd64465_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "HD64465", NULL, NULL};
157 157  
158 158  
159 159 static int __init setup_hd64465(void)
arch/sh/cchips/voyagergx/irq.c
Diff comments   View file @ 6d20819
... ... @@ -165,7 +165,7 @@
165 165 static struct irqaction irq0 = {
166 166 .name = "voyagergx",
167 167 .handler = voyagergx_interrupt,
168   - .flags = SA_INTERRUPT,
  168 + .flags = IRQF_DISABLED,
169 169 .mask = CPU_MASK_NONE,
170 170 };
171 171  
arch/sh/drivers/dma/dma-g2.c
Diff comments   View file @ 6d20819
... ... @@ -56,7 +56,7 @@
56 56 static struct irqaction g2_dma_irq = {
57 57 .name = "g2 DMA handler",
58 58 .handler = g2_dma_interrupt,
59   - .flags = SA_INTERRUPT,
  59 + .flags = IRQF_DISABLED,
60 60 };
61 61  
62 62 static int g2_enable_dma(struct dma_channel *chan)
arch/sh/drivers/dma/dma-pvr2.c
Diff comments   View file @ 6d20819
... ... @@ -70,7 +70,7 @@
70 70 static struct irqaction pvr2_dma_irq = {
71 71 .name = "pvr2 DMA handler",
72 72 .handler = pvr2_dma_interrupt,
73   - .flags = SA_INTERRUPT,
  73 + .flags = IRQF_DISABLED,
74 74 };
75 75  
76 76 static struct dma_ops pvr2_dma_ops = {
arch/sh/drivers/dma/dma-sh.c
Diff comments   View file @ 6d20819
... ... @@ -90,7 +90,7 @@
90 90 chan->chan);
91 91  
92 92 return request_irq(get_dmte_irq(chan->chan), dma_tei,
93   - SA_INTERRUPT, name, chan);
  93 + IRQF_DISABLED, name, chan);
94 94 }
95 95  
96 96 static void sh_dmac_free_dma(struct dma_channel *chan)
... ... @@ -258,7 +258,7 @@
258 258  
259 259 #ifdef CONFIG_CPU_SH4
260 260 make_ipr_irq(DMAE_IRQ, DMA_IPR_ADDR, DMA_IPR_POS, DMA_PRIORITY);
261   - i = request_irq(DMAE_IRQ, dma_err, SA_INTERRUPT, "DMAC Address Error", 0);
  261 + i = request_irq(DMAE_IRQ, dma_err, IRQF_DISABLED, "DMAC Address Error", 0);
262 262 if (i < 0)
263 263 return i;
264 264 #endif
arch/sh/drivers/pci/pci-st40.c
Diff comments   View file @ 6d20819
... ... @@ -447,7 +447,7 @@
447 447 PHYSADDR(memory_end) - PHYSADDR(memory_start));
448 448  
449 449 if (request_irq(ST40PCI_ERR_IRQ, st40_pci_irq,
450   - SA_INTERRUPT, "st40pci", NULL)) {
  450 + IRQF_DISABLED, "st40pci", NULL)) {
451 451 printk(KERN_ERR "st40pci: Cannot hook interrupt\n");
452 452 return -EIO;
453 453 }
arch/sh/kernel/timers/timer-tmu.c
Diff comments   View file @ 6d20819
... ... @@ -107,7 +107,7 @@
107 107 static struct irqaction tmu_irq = {
108 108 .name = "timer",
109 109 .handler = tmu_timer_interrupt,
110   - .flags = SA_INTERRUPT,
  110 + .flags = IRQF_DISABLED,
111 111 .mask = CPU_MASK_NONE,
112 112 };
113 113  
include/asm-sh/floppy.h
Diff comments   View file @ 6d20819
... ... @@ -146,12 +146,11 @@
146 146 static int fd_request_irq(void)
147 147 {
148 148 if(can_use_virtual_dma)
149   - return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
150   - "floppy", NULL);
  149 + return request_irq(FLOPPY_IRQ, floppy_hardint,
  150 + IRQF_DISABLED, "floppy", NULL);
151 151 else
152   - return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
153   - "floppy", NULL);
154   -
  152 + return request_irq(FLOPPY_IRQ, floppy_interrupt,
  153 + IRQF_DISABLED, "floppy", NULL);
155 154 }
156 155  
157 156 static unsigned long dma_mem_alloc(unsigned long size)
include/asm-sh/mpc1211/keyboard.h
Diff comments   View file @ 6d20819
... ... @@ -57,7 +57,7 @@
57 57 #define AUX_IRQ 12
58 58  
59 59 #define aux_request_irq(hand, dev_id) \
60   - request_irq(AUX_IRQ, hand, SA_SHIRQ, "PS2 Mouse", dev_id)
  60 + request_irq(AUX_IRQ, hand, IRQF_SHARED, "PS2 Mouse", dev_id)
61 61  
62 62 #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
63 63  
include/asm-sh/signal.h
Diff comments   View file @ 6d20819
... ... @@ -75,7 +75,6 @@
75 75 * SA_FLAGS values:
76 76 *
77 77 * SA_ONSTACK indicates that a registered stack_t will be used.
78   - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
79 78 * SA_RESTART flag to get restarting signals (which were the default long ago)
80 79 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
81 80 * SA_RESETHAND clears the handler when the signal is delivered.
... ... @@ -95,7 +94,6 @@
95 94  
96 95 #define SA_NOMASK SA_NODEFER
97 96 #define SA_ONESHOT SA_RESETHAND
98   -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
99 97  
100 98 #define SA_RESTORER 0x04000000
101 99