aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-12-11 17:05:19 -0500
committerKukjin Kim <kgene.kim@samsung.com>2013-12-11 17:05:19 -0500
commitfa53d5cdbffbce421c3bd2f937b5626fc044fedc (patch)
tree24899de81dbb158c59fa70c2f0d872ca249fc3c4 /arch/arm
parentb65f372a1e787c24769e5a4c6caa97465c0939b9 (diff)
ARM: SAMSUNG: remove IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag. It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Reviewed-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c24xx/dma.c2
-rw-r--r--arch/arm/mach-s3c24xx/simtec-usb.c3
-rw-r--r--arch/arm/mach-s3c64xx/mach-smartq.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/dma.c b/arch/arm/mach-s3c24xx/dma.c
index 4a65cba3295d..a8dafc174fe3 100644
--- a/arch/arm/mach-s3c24xx/dma.c
+++ b/arch/arm/mach-s3c24xx/dma.c
@@ -742,7 +742,7 @@ int s3c2410_dma_request(enum dma_ch channel,
742 chan->irq_claimed = 1; 742 chan->irq_claimed = 1;
743 local_irq_restore(flags); 743 local_irq_restore(flags);
744 744
745 err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED, 745 err = request_irq(chan->irq, s3c2410_dma_irq, 0,
746 client->name, (void *)chan); 746 client->name, (void *)chan);
747 747
748 local_irq_save(flags); 748 local_irq_save(flags);
diff --git a/arch/arm/mach-s3c24xx/simtec-usb.c b/arch/arm/mach-s3c24xx/simtec-usb.c
index 2ed2e32430dc..bb3eac6a7697 100644
--- a/arch/arm/mach-s3c24xx/simtec-usb.c
+++ b/arch/arm/mach-s3c24xx/simtec-usb.c
@@ -78,8 +78,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
78 78
79 if (on) { 79 if (on) {
80 ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq, 80 ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,
81 IRQF_DISABLED | IRQF_TRIGGER_RISING | 81 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
82 IRQF_TRIGGER_FALLING,
83 "USB Over-current", info); 82 "USB Over-current", info);
84 if (ret != 0) { 83 if (ret != 0) {
85 printk(KERN_ERR "failed to request usb oc irq\n"); 84 printk(KERN_ERR "failed to request usb oc irq\n");
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index a6b338fd0470..08a889c141da 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -106,7 +106,7 @@ static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
106 106
107 if (on) { 107 if (on) {
108 ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)), 108 ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
109 smartq_usb_host_ocirq, IRQF_DISABLED | 109 smartq_usb_host_ocirq,
110 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, 110 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
111 "USB host overcurrent", info); 111 "USB host overcurrent", info);
112 if (ret != 0) 112 if (ret != 0)