diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/cpci_hotplug_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpcihp_zt5550.c | 5 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpqphp_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_hpc.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c index 30d87143b5d9..d5df5871cfa2 100644 --- a/drivers/pci/hotplug/cpci_hotplug_core.c +++ b/drivers/pci/hotplug/cpci_hotplug_core.c | |||
@@ -347,7 +347,7 @@ cpci_hp_intr(int irq, void *data, struct pt_regs *regs) | |||
347 | dbg("entered cpci_hp_intr"); | 347 | dbg("entered cpci_hp_intr"); |
348 | 348 | ||
349 | /* Check to see if it was our interrupt */ | 349 | /* Check to see if it was our interrupt */ |
350 | if ((controller->irq_flags & SA_SHIRQ) && | 350 | if ((controller->irq_flags & IRQF_SHARED) && |
351 | !controller->ops->check_irq(controller->dev_id)) { | 351 | !controller->ops->check_irq(controller->dev_id)) { |
352 | dbg("exited cpci_hp_intr, not our interrupt"); | 352 | dbg("exited cpci_hp_intr, not our interrupt"); |
353 | return IRQ_NONE; | 353 | return IRQ_NONE; |
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c index 584f8538da13..1c12e9171097 100644 --- a/drivers/pci/hotplug/cpcihp_zt5550.c +++ b/drivers/pci/hotplug/cpcihp_zt5550.c | |||
@@ -35,7 +35,8 @@ | |||
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
38 | #include <linux/signal.h> /* SA_SHIRQ */ | 38 | #include <linux/interrupt.h> |
39 | #include <linux/signal.h> /* IRQF_SHARED */ | ||
39 | #include "cpci_hotplug.h" | 40 | #include "cpci_hotplug.h" |
40 | #include "cpcihp_zt5550.h" | 41 | #include "cpcihp_zt5550.h" |
41 | 42 | ||
@@ -219,7 +220,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id | |||
219 | zt5550_hpc.ops = &zt5550_hpc_ops; | 220 | zt5550_hpc.ops = &zt5550_hpc_ops; |
220 | if(!poll) { | 221 | if(!poll) { |
221 | zt5550_hpc.irq = hc_dev->irq; | 222 | zt5550_hpc.irq = hc_dev->irq; |
222 | zt5550_hpc.irq_flags = SA_SHIRQ; | 223 | zt5550_hpc.irq_flags = IRQF_SHARED; |
223 | zt5550_hpc.dev_id = hc_dev; | 224 | zt5550_hpc.dev_id = hc_dev; |
224 | 225 | ||
225 | zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq; | 226 | zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq; |
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index e6e171f77c34..1fc259913b68 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
@@ -1188,7 +1188,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1188 | /* set up the interrupt */ | 1188 | /* set up the interrupt */ |
1189 | dbg("HPC interrupt = %d \n", ctrl->interrupt); | 1189 | dbg("HPC interrupt = %d \n", ctrl->interrupt); |
1190 | if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr, | 1190 | if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr, |
1191 | SA_SHIRQ, MY_NAME, ctrl)) { | 1191 | IRQF_SHARED, MY_NAME, ctrl)) { |
1192 | err("Can't get irq %d for the hotplug pci controller\n", | 1192 | err("Can't get irq %d for the hotplug pci controller\n", |
1193 | ctrl->interrupt); | 1193 | ctrl->interrupt); |
1194 | rc = -ENODEV; | 1194 | rc = -ENODEV; |
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 11f7858f0064..0d8fb6e607a1 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
@@ -1458,7 +1458,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev) | |||
1458 | start_int_poll_timer( php_ctlr, 10 ); /* start with 10 second delay */ | 1458 | start_int_poll_timer( php_ctlr, 10 ); /* start with 10 second delay */ |
1459 | } else { | 1459 | } else { |
1460 | /* Installs the interrupt handler */ | 1460 | /* Installs the interrupt handler */ |
1461 | rc = request_irq(php_ctlr->irq, pcie_isr, SA_SHIRQ, MY_NAME, (void *) ctrl); | 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); | 1462 | dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); |
1463 | if (rc) { | 1463 | if (rc) { |
1464 | err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq); | 1464 | err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq); |
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index 45facaad39bd..0f9798df4704 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c | |||
@@ -1246,7 +1246,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev) | |||
1246 | } else | 1246 | } else |
1247 | php_ctlr->irq = pdev->irq; | 1247 | php_ctlr->irq = pdev->irq; |
1248 | 1248 | ||
1249 | rc = request_irq(php_ctlr->irq, shpc_isr, SA_SHIRQ, MY_NAME, (void *) ctrl); | 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); | 1250 | dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc); |
1251 | if (rc) { | 1251 | if (rc) { |
1252 | err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq); | 1252 | err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq); |