tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Thomas Gleixner and committed by
Linus Torvalds 6b4486e2 8c56e721

+7 -6
unified split
+1 -1
drivers/pci/hotplug/cpci_hotplug_core.c
··· 347 dbg("entered cpci_hp_intr"); 348 349 /* Check to see if it was our interrupt */ 350 - if ((controller->irq_flags & SA_SHIRQ) && 351 !controller->ops->check_irq(controller->dev_id)) { 352 dbg("exited cpci_hp_intr, not our interrupt"); 353 return IRQ_NONE;
··· 347 dbg("entered cpci_hp_intr"); 348 349 /* Check to see if it was our interrupt */ 350 + if ((controller->irq_flags & IRQF_SHARED) && 351 !controller->ops->check_irq(controller->dev_id)) { 352 dbg("exited cpci_hp_intr, not our interrupt"); 353 return IRQ_NONE;
+3 -2
drivers/pci/hotplug/cpcihp_zt5550.c
··· 35 #include <linux/init.h> 36 #include <linux/errno.h> 37 #include <linux/pci.h> 38 - #include <linux/signal.h> /* SA_SHIRQ */ 39 #include "cpci_hotplug.h" 40 #include "cpcihp_zt5550.h" 41 ··· 220 zt5550_hpc.ops = &zt5550_hpc_ops; 221 if(!poll) { 222 zt5550_hpc.irq = hc_dev->irq; 223 - zt5550_hpc.irq_flags = SA_SHIRQ; 224 zt5550_hpc.dev_id = hc_dev; 225 226 zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
··· 35 #include <linux/init.h> 36 #include <linux/errno.h> 37 #include <linux/pci.h> 38 + #include <linux/interrupt.h> 39 + #include <linux/signal.h> /* IRQF_SHARED */ 40 #include "cpci_hotplug.h" 41 #include "cpcihp_zt5550.h" 42 ··· 219 zt5550_hpc.ops = &zt5550_hpc_ops; 220 if(!poll) { 221 zt5550_hpc.irq = hc_dev->irq; 222 + zt5550_hpc.irq_flags = IRQF_SHARED; 223 zt5550_hpc.dev_id = hc_dev; 224 225 zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
+1 -1
drivers/pci/hotplug/cpqphp_core.c
··· 1188 /* set up the interrupt */ 1189 dbg("HPC interrupt = %d \n", ctrl->interrupt); 1190 if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr, 1191 - SA_SHIRQ, MY_NAME, ctrl)) { 1192 err("Can't get irq %d for the hotplug pci controller\n", 1193 ctrl->interrupt); 1194 rc = -ENODEV;
··· 1188 /* set up the interrupt */ 1189 dbg("HPC interrupt = %d \n", ctrl->interrupt); 1190 if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr, 1191 + IRQF_SHARED, MY_NAME, ctrl)) { 1192 err("Can't get irq %d for the hotplug pci controller\n", 1193 ctrl->interrupt); 1194 rc = -ENODEV;
+1 -1
drivers/pci/hotplug/pciehp_hpc.c
··· 1458 start_int_poll_timer( php_ctlr, 10 ); /* start with 10 second delay */ 1459 } else { 1460 /* Installs the interrupt handler */ 1461 - rc = request_irq(php_ctlr->irq, pcie_isr, SA_SHIRQ, MY_NAME, (void *) ctrl); 1462 dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); 1463 if (rc) { 1464 err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
··· 1458 start_int_poll_timer( php_ctlr, 10 ); /* start with 10 second delay */ 1459 } else { 1460 /* Installs the interrupt handler */ 1461 + rc = request_irq(php_ctlr->irq, pcie_isr, IRQF_SHARED, MY_NAME, (void *) ctrl); 1462 dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); 1463 if (rc) { 1464 err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
+1 -1
drivers/pci/hotplug/shpchp_hpc.c
··· 1246 } else 1247 php_ctlr->irq = pdev->irq; 1248 1249 - rc = request_irq(php_ctlr->irq, shpc_isr, SA_SHIRQ, MY_NAME, (void *) ctrl); 1250 dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); 1251 if (rc) { 1252 err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
··· 1246 } else 1247 php_ctlr->irq = pdev->irq; 1248 1249 + rc = request_irq(php_ctlr->irq, shpc_isr, IRQF_SHARED, MY_NAME, (void *) ctrl); 1250 dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); 1251 if (rc) { 1252 err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);