Skip to contentSkip to conversation

ARM: SAMSUNG: remove IRQF_DISABLED

PATCH RESEND In review Michael Opdenacker 2 participants 2 messages Dec 9, 2013 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#1 lore raw

PATCH RESEND 1/1 ARM: SAMSUNG: remove IRQF_DISABLED

In reply to a message not in the archive

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.

---
 arch/arm/mach-s3c24xx/dma.c         | 2 +-
 arch/arm/mach-s3c24xx/simtec-usb.c  | 3 +--
 arch/arm/mach-s3c64xx/mach-smartq.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-s3c24xx/dma.c +1 -1
index 4a65cba3295d..a8dafc174fe3 100644
@@ -742,7 +742,7 @@ int s3c2410_dma_request(enum dma_ch channel,
 		chan->irq_claimed = 1;
 		local_irq_restore(flags);
 
-		err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED,
+		err = request_irq(chan->irq, s3c2410_dma_irq, 0,
 				  client->name, (void *)chan);
 
 		local_irq_save(flags);
arch/arm/mach-s3c24xx/simtec-usb.c +1 -2
index 2ed2e32430dc..bb3eac6a7697 100644
@@ -78,8 +78,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
 
 	if (on) {
 		ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,
-				  IRQF_DISABLED | IRQF_TRIGGER_RISING |
-				   IRQF_TRIGGER_FALLING,
+				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 				  "USB Over-current", info);
 		if (ret != 0) {
 			printk(KERN_ERR "failed to request usb oc irq\n");
arch/arm/mach-s3c64xx/mach-smartq.c +1 -1
index a6b338fd0470..08a889c141da 100644
@@ -106,7 +106,7 @@ static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
 
 	if (on) {
 		ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
-				  smartq_usb_host_ocirq, IRQF_DISABLED |
+				  smartq_usb_host_ocirq,
 				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 				  "USB host overcurrent", info);
 		if (ret != 0)
Signature · 1 line
1.8.3.2
#2 lore raw
Quoted 44 lines · Michael Opdenacker

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.

---
  arch/arm/mach-s3c24xx/dma.c         | 2 +-
  arch/arm/mach-s3c24xx/simtec-usb.c  | 3 +--
  arch/arm/mach-s3c64xx/mach-smartq.c | 2 +-
  3 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-s3c24xx/dma.c +1 -1
index 4a65cba3295d..a8dafc174fe3 100644
@@ -742,7 +742,7 @@ int s3c2410_dma_request(enum dma_ch channel,
  		chan->irq_claimed = 1;
  		local_irq_restore(flags);
 
-		err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED,
+		err = request_irq(chan->irq, s3c2410_dma_irq, 0,
  				  client->name, (void *)chan);
 
  		local_irq_save(flags);
arch/arm/mach-s3c24xx/simtec-usb.c +1 -2
index 2ed2e32430dc..bb3eac6a7697 100644
@@ -78,8 +78,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
 
  	if (on) {
  		ret = request_irq(BAST_IRQ_USBOC, usb_simtec_ocirq,
-				  IRQF_DISABLED | IRQF_TRIGGER_RISING |
-				   IRQF_TRIGGER_FALLING,
+				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
  				  "USB Over-current", info);
  		if (ret != 0) {
  			printk(KERN_ERR "failed to request usb oc irq\n");
arch/arm/mach-s3c64xx/mach-smartq.c +0 -0
index a6b338fd0470..08a889c141da 100644

arch/arm/mach-s3c64xx/mach-smartq.c static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on) · line 112

Quoted 8 lines
arch/arm/mach-s3c64xx/mach-smartq.c +1 -1
@@ -106,7 +106,7 @@ static void smartq_usb_host_enableoc(struct s3c2410_hcd_info *info, int on)
 
  	if (on) {
  		ret = request_irq(gpio_to_irq(S3C64XX_GPL(10)),
-				  smartq_usb_host_ocirq, IRQF_DISABLED |
+				  smartq_usb_host_ocirq,
  				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
  				  "USB host overcurrent", info);
  		if (ret != 0)

Looks OK to me, applied.

Thanks,
Kukjin