FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove DAHDI_IRQF_[SHARED|DISABLED] flags.

Browse Source 
These flags are direct mappings to the IRQF_[SHARED|DISABLED] flags and no
longer need to be kept separate.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
(cherry picked from commit 64a98af676)
This commit is contained in:
Shaun Ruffell 2015-04-20 11:17:09 -05:00 committed by Russ Meyerriecks
parent 4305b44108
commit f56b748f73
12 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/dahdi/pciradio.c
View File

@ -1784,7 +1784,8 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de
} }
if (request_irq(pdev->irq, pciradio_interrupt, DAHDI_IRQ_SHARED, "pciradio", rad)) { if (request_irq(pdev->irq, pciradio_interrupt,
IRQF_SHARED, "pciradio", rad)) {
printk(KERN_NOTICE "pciradio: Unable to request IRQ %d\n", pdev->irq); printk(KERN_NOTICE "pciradio: Unable to request IRQ %d\n", pdev->irq);
if (rad->freeregion) if (rad->freeregion)
release_region(rad->ioaddr, 0xff); release_region(rad->ioaddr, 0xff);

3
drivers/dahdi/tor2.c
View File

@ -543,7 +543,8 @@ static int __devinit tor2_probe(struct pci_dev *pdev, const struct pci_device_id
for (x = 0; x < 256; x++) for (x = 0; x < 256; x++)
writel(0x7f7f7f7f, &tor->mem32[x]); writel(0x7f7f7f7f, &tor->mem32[x]);
if (request_irq(tor->irq, tor2_intr, DAHDI_IRQ_SHARED_DISABLED, "tor2", tor)) { if (request_irq(tor->irq, tor2_intr,
IRQF_SHARED | IRQF_DISABLED, "tor2", tor)) {
printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq); printk(KERN_ERR "Unable to request tormenta IRQ %d\n", tor->irq);
goto err_out_release_all; goto err_out_release_all;
} }

2
drivers/dahdi/voicebus/voicebus.c
View File

@ -1885,7 +1885,7 @@ __voicebus_init(struct voicebus *vb, const char *board_name,
goto cleanup; goto cleanup;
#if !defined(CONFIG_VOICEBUS_TIMER) #if !defined(CONFIG_VOICEBUS_TIMER)
retval = request_irq(vb->pdev->irq, vb_isr, DAHDI_IRQ_SHARED, retval = request_irq(vb->pdev->irq, vb_isr, IRQF_SHARED,
board_name, vb); board_name, vb);
if (retval) { if (retval) {
dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n"); dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n");

3
drivers/dahdi/wcb4xxp/base.c
View File

@ -2951,7 +2951,8 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id
create_sysfs_files(b4); create_sysfs_files(b4);
if (request_irq(pdev->irq, b4xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "b4xxp", b4)) { if (request_irq(pdev->irq, b4xxp_interrupt,
IRQF_SHARED | IRQF_DISABLED, "b4xxp", b4)) {
dev_err(&b4->pdev->dev, "Unable to request IRQ %d\n", dev_err(&b4->pdev->dev, "Unable to request IRQ %d\n",
pdev->irq); pdev->irq);
ret = -EIO; ret = -EIO;

2
drivers/dahdi/wcfxo.c
View File

@ -972,7 +972,7 @@ static int __devinit wcfxo_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */ /* Keep track of which device we are */
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
if (request_irq(pdev->irq, wcfxo_interrupt, DAHDI_IRQ_SHARED, "wcfxo", wc)) { if (request_irq(pdev->irq, wcfxo_interrupt, IRQF_SHARED, "wcfxo", wc)) {
printk(KERN_NOTICE "wcfxo: Unable to request IRQ %d\n", pdev->irq); printk(KERN_NOTICE "wcfxo: Unable to request IRQ %d\n", pdev->irq);
if (wc->freeregion) if (wc->freeregion)
release_region(wc->ioaddr, 0xff); release_region(wc->ioaddr, 0xff);

3
drivers/dahdi/wct1xxp.c
View File

@ -1333,7 +1333,8 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */ /* Keep track of which device we are */
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "t1xxp", wc)) { if (request_irq(pdev->irq, t1xxp_interrupt,
IRQF_SHARED | IRQF_DISABLED, "t1xxp", wc)) {
printk(KERN_NOTICE "t1xxp: Unable to request IRQ %d\n", pdev->irq); printk(KERN_NOTICE "t1xxp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc); kfree(wc);
return -EIO; return -EIO;

4
drivers/dahdi/wct4xxp/base.c
View File

@ -5334,7 +5334,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
#ifdef SUPPORT_GEN1 #ifdef SUPPORT_GEN1
if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ? if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
t4_interrupt_gen2 : t4_interrupt, t4_interrupt_gen2 : t4_interrupt,
DAHDI_IRQ_SHARED, IRQF_SHARED,
(wc->numspans == 8) ? "wct8xxp" : (wc->numspans == 8) ? "wct8xxp" :
(wc->numspans == 2) ? "wct2xxp" : (wc->numspans == 2) ? "wct2xxp" :
"wct4xxp", "wct4xxp",
@ -5348,7 +5348,7 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
if (request_irq(pdev->irq, t4_interrupt_gen2, if (request_irq(pdev->irq, t4_interrupt_gen2,
DAHDI_IRQ_SHARED, "t4xxp", wc)) { IRQF_SHARED, "t4xxp", wc)) {
#endif #endif
dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n", dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n",
pdev->irq); pdev->irq);

2
drivers/dahdi/wctc4xxp/base.c
View File

@ -4105,7 +4105,7 @@ wctc4xxp_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev); pci_set_master(pdev);
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
res = request_irq(pdev->irq, wctc4xxp_interrupt, res = request_irq(pdev->irq, wctc4xxp_interrupt,
DAHDI_IRQ_SHARED, wc->board_name, wc); IRQF_SHARED, wc->board_name, wc);
if (res) { if (res) {
dev_err(&wc->pdev->dev, dev_err(&wc->pdev->dev,
"Unable to request IRQ %d\n", pdev->irq); "Unable to request IRQ %d\n", pdev->irq);

3
drivers/dahdi/wctdm.c
View File

@ -2684,7 +2684,8 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */ /* Keep track of which device we are */
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
if (request_irq(pdev->irq, wctdm_interrupt, DAHDI_IRQ_SHARED, "wctdm", wc)) { if (request_irq(pdev->irq, wctdm_interrupt,
IRQF_SHARED, "wctdm", wc)) {
printk(KERN_NOTICE "wctdm: Unable to request IRQ %d\n", pdev->irq); printk(KERN_NOTICE "wctdm: Unable to request IRQ %d\n", pdev->irq);
if (wc->freeregion) if (wc->freeregion)
release_region(wc->ioaddr, 0xff); release_region(wc->ioaddr, 0xff);

3
drivers/dahdi/wcte11xp.c
View File

@ -1534,7 +1534,8 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
/* Keep track of which device we are */ /* Keep track of which device we are */
pci_set_drvdata(pdev, wc); pci_set_drvdata(pdev, wc);
if (request_irq(pdev->irq, t1xxp_interrupt, DAHDI_IRQ_SHARED_DISABLED, "wcte11xp", wc)) { if (request_irq(pdev->irq, t1xxp_interrupt,
IRQF_SHARED | IRQF_DISABLED, "wcte11xp", wc)) {
printk(KERN_NOTICE "wcte11xp: Unable to request IRQ %d\n", pdev->irq); printk(KERN_NOTICE "wcte11xp: Unable to request IRQ %d\n", pdev->irq);
kfree(wc); kfree(wc);
return -EIO; return -EIO;

2
drivers/dahdi/wcxb.c
View File

@ -685,7 +685,7 @@ int wcxb_init(struct wcxb *xb, const char *board_name, u32 int_mode)
xb->flags.have_msi = (int_mode) ? 0 : (0 == pci_enable_msi(pdev)); xb->flags.have_msi = (int_mode) ? 0 : (0 == pci_enable_msi(pdev));
if (request_irq(pdev->irq, wcxb_isr, if (request_irq(pdev->irq, wcxb_isr,
(xb->flags.have_msi) ? 0 : DAHDI_IRQ_SHARED, (xb->flags.have_msi) ? 0 : IRQF_SHARED,
board_name, xb)) { board_name, xb)) {
dev_notice(&xb->pdev->dev, "Unable to request IRQ %d\n", dev_notice(&xb->pdev->dev, "Unable to request IRQ %d\n",
pdev->irq); pdev->irq);

4
include/dahdi/kernel.h
View File

@ -76,10 +76,6 @@
#define HAVE_NET_DEVICE_OPS #define HAVE_NET_DEVICE_OPS
#endif #endif
#define DAHDI_IRQ_SHARED IRQF_SHARED
#define DAHDI_IRQ_DISABLED IRQF_DISABLED
#define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
# ifdef RHEL_RELEASE_VERSION # ifdef RHEL_RELEASE_VERSION
# if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6) # if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5, 6)