You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] irq-flags: misc drivers: 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> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
8076fe32a7
commit
dace145374
@@ -1278,7 +1278,7 @@ static int mfm_do_init(unsigned char irqmask)
|
||||
|
||||
printk("mfm: detected %d hard drive%s\n", mfm_drives,
|
||||
mfm_drives == 1 ? "" : "s");
|
||||
ret = request_irq(mfm_irq, mfm_interrupt_handler, SA_INTERRUPT, "MFM harddisk", NULL);
|
||||
ret = request_irq(mfm_irq, mfm_interrupt_handler, IRQF_DISABLED, "MFM harddisk", NULL);
|
||||
if (ret) {
|
||||
printk("mfm: unable to get IRQ%d\n", mfm_irq);
|
||||
goto out4;
|
||||
|
||||
+1
-1
@@ -280,7 +280,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
|
||||
|
||||
acpi_irq_handler = handler;
|
||||
acpi_irq_context = context;
|
||||
if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {
|
||||
if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
|
||||
printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
|
||||
return AE_NOT_ACQUIRED;
|
||||
}
|
||||
|
||||
@@ -2286,7 +2286,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_
|
||||
setup_pci_dev(pci_dev);
|
||||
|
||||
// grab (but share) IRQ and install handler
|
||||
err = request_irq(irq, interrupt_handler, SA_SHIRQ, DEV_LABEL, dev);
|
||||
err = request_irq(irq, interrupt_handler, IRQF_SHARED, DEV_LABEL, dev);
|
||||
if (err < 0) {
|
||||
PRINTK (KERN_ERR, "request IRQ failed!");
|
||||
goto out_reset;
|
||||
|
||||
+1
-1
@@ -1797,7 +1797,7 @@ static int __devinit eni_start(struct atm_dev *dev)
|
||||
|
||||
DPRINTK(">eni_start\n");
|
||||
eni_dev = ENI_DEV(dev);
|
||||
if (request_irq(eni_dev->irq,&eni_int,SA_SHIRQ,DEV_LABEL,dev)) {
|
||||
if (request_irq(eni_dev->irq,&eni_int,IRQF_SHARED,DEV_LABEL,dev)) {
|
||||
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
|
||||
dev->number,eni_dev->irq);
|
||||
error = -EAGAIN;
|
||||
|
||||
@@ -1829,7 +1829,7 @@ static int __devinit fs_init (struct fs_dev *dev)
|
||||
init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);
|
||||
|
||||
dev->irq = pci_dev->irq;
|
||||
if (request_irq (dev->irq, fs_irq, SA_SHIRQ, "firestream", dev)) {
|
||||
if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {
|
||||
printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);
|
||||
/* XXX undo all previous stuff... */
|
||||
return 1;
|
||||
|
||||
@@ -2123,7 +2123,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)
|
||||
static int __devinit
|
||||
fore200e_irq_request(struct fore200e* fore200e)
|
||||
{
|
||||
if (request_irq(fore200e->irq, fore200e_interrupt, SA_SHIRQ, fore200e->name, fore200e->atm_dev) < 0) {
|
||||
if (request_irq(fore200e->irq, fore200e_interrupt, IRQF_SHARED, fore200e->name, fore200e->atm_dev) < 0) {
|
||||
|
||||
printk(FORE200E "unable to reserve IRQ %s for device %s\n",
|
||||
fore200e_irq_itoa(fore200e->irq), fore200e->name);
|
||||
|
||||
+1
-1
@@ -1007,7 +1007,7 @@ he_init_irq(struct he_dev *he_dev)
|
||||
he_writel(he_dev, 0x0, GRP_54_MAP);
|
||||
he_writel(he_dev, 0x0, GRP_76_MAP);
|
||||
|
||||
if (request_irq(he_dev->pci_dev->irq, he_irq_handler, SA_INTERRUPT|SA_SHIRQ, DEV_LABEL, he_dev)) {
|
||||
if (request_irq(he_dev->pci_dev->irq, he_irq_handler, IRQF_DISABLED|IRQF_SHARED, DEV_LABEL, he_dev)) {
|
||||
hprintk("irq %d already in use\n", he_dev->pci_dev->irq);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -2735,7 +2735,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
|
||||
irq = pci_dev->irq;
|
||||
if (request_irq(irq,
|
||||
interrupt_handler,
|
||||
SA_SHIRQ, /* irqflags guess */
|
||||
IRQF_SHARED, /* irqflags guess */
|
||||
DEV_LABEL, /* name guess */
|
||||
dev)) {
|
||||
PRINTD(DBG_WARN, "request IRQ failed!");
|
||||
|
||||
@@ -3386,7 +3386,7 @@ init_card(struct atm_dev *dev)
|
||||
writel(SAR_STAT_TMROF, SAR_REG_STAT);
|
||||
}
|
||||
IPRINTK("%s: Request IRQ ... ", card->name);
|
||||
if (request_irq(pcidev->irq, idt77252_interrupt, SA_INTERRUPT|SA_SHIRQ,
|
||||
if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED,
|
||||
card->name, card) != 0) {
|
||||
printk("%s: can't allocate IRQ.\n", card->name);
|
||||
deinit_card(card);
|
||||
|
||||
@@ -2488,7 +2488,7 @@ static int __devinit ia_start(struct atm_dev *dev)
|
||||
u32 ctrl_reg;
|
||||
IF_EVENT(printk(">ia_start\n");)
|
||||
iadev = INPH_IA_DEV(dev);
|
||||
if (request_irq(iadev->irq, &ia_int, SA_SHIRQ, DEV_LABEL, dev)) {
|
||||
if (request_irq(iadev->irq, &ia_int, IRQF_SHARED, DEV_LABEL, dev)) {
|
||||
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
|
||||
dev->number, iadev->irq);
|
||||
error = -EAGAIN;
|
||||
|
||||
+1
-1
@@ -2240,7 +2240,7 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev)
|
||||
conf2_write(lanai);
|
||||
reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg);
|
||||
reg_write(lanai, 0, CBR_ICG_Reg); /* CBR defaults to no limit */
|
||||
if ((result = request_irq(lanai->pci->irq, lanai_int, SA_SHIRQ,
|
||||
if ((result = request_irq(lanai->pci->irq, lanai_int, IRQF_SHARED,
|
||||
DEV_LABEL, lanai)) != 0) {
|
||||
printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n");
|
||||
goto error_vcctable;
|
||||
|
||||
@@ -625,7 +625,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
|
||||
if (mac[i] == NULL)
|
||||
nicstar_init_eprom(card->membase);
|
||||
|
||||
if (request_irq(pcidev->irq, &ns_irq_handler, SA_INTERRUPT | SA_SHIRQ, "nicstar", card) != 0)
|
||||
if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
|
||||
{
|
||||
printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
|
||||
error = 9;
|
||||
|
||||
+1
-1
@@ -1270,7 +1270,7 @@ static int __init zatm_start(struct atm_dev *dev)
|
||||
zatm_dev->rx_map = zatm_dev->tx_map = NULL;
|
||||
for (i = 0; i < NR_MBX; i++)
|
||||
zatm_dev->mbx_start[i] = 0;
|
||||
error = request_irq(zatm_dev->irq, zatm_int, SA_SHIRQ, DEV_LABEL, dev);
|
||||
error = request_irq(zatm_dev->irq, zatm_int, IRQF_SHARED, DEV_LABEL, dev);
|
||||
if (error < 0) {
|
||||
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
|
||||
dev->number,zatm_dev->irq);
|
||||
|
||||
@@ -3141,7 +3141,7 @@ int __init cdu31a_init(void)
|
||||
|
||||
if (cdu31a_irq > 0) {
|
||||
if (request_irq
|
||||
(cdu31a_irq, cdu31a_interrupt, SA_INTERRUPT,
|
||||
(cdu31a_irq, cdu31a_interrupt, IRQF_DISABLED,
|
||||
"cdu31a", NULL)) {
|
||||
printk(KERN_WARNING PFX "Unable to grab IRQ%d for "
|
||||
"the CDU31A driver\n", cdu31a_irq);
|
||||
|
||||
@@ -1193,7 +1193,7 @@ static int __init mcdx_init_drive(int drive)
|
||||
}
|
||||
|
||||
xtrace(INIT, "init() subscribe irq and i/o\n");
|
||||
if (request_irq(stuffp->irq, mcdx_intr, SA_INTERRUPT, "mcdx", stuffp)) {
|
||||
if (request_irq(stuffp->irq, mcdx_intr, IRQF_DISABLED, "mcdx", stuffp)) {
|
||||
release_region(stuffp->wreg_data, MCDX_IO_SIZE);
|
||||
xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n",
|
||||
MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq);
|
||||
|
||||
@@ -1527,7 +1527,7 @@ static int __init sony535_init(void)
|
||||
}
|
||||
if (sony535_irq_used > 0) {
|
||||
if (request_irq(sony535_irq_used, cdu535_interrupt,
|
||||
SA_INTERRUPT, CDU535_HANDLE, NULL)) {
|
||||
IRQF_DISABLED, CDU535_HANDLE, NULL)) {
|
||||
printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME
|
||||
" driver; polling instead.\n", sony535_irq_used);
|
||||
sony535_irq_used = 0;
|
||||
|
||||
@@ -739,7 +739,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
|
||||
device->msi = 0;
|
||||
}
|
||||
#endif
|
||||
err = request_irq(pdev->irq, &ioat_do_interrupt, SA_SHIRQ, "ioat",
|
||||
err = request_irq(pdev->irq, &ioat_do_interrupt, IRQF_SHARED, "ioat",
|
||||
device);
|
||||
if (err)
|
||||
goto err_irq;
|
||||
|
||||
+1
-1
@@ -637,7 +637,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
|
||||
|
||||
irq = sdev->irqs[0];
|
||||
|
||||
if (request_irq (irq, soc_intr, SA_SHIRQ, "SOC", (void *)s)) {
|
||||
if (request_irq (irq, soc_intr, IRQF_SHARED, "SOC", (void *)s)) {
|
||||
soc_printk ("Cannot order irq %d to go\n", irq);
|
||||
socs = s->next;
|
||||
return;
|
||||
|
||||
+1
-1
@@ -761,7 +761,7 @@ static inline void socal_init(struct sbus_dev *sdev, int no)
|
||||
|
||||
irq = sdev->irqs[0];
|
||||
|
||||
if (request_irq (irq, socal_intr, SA_SHIRQ, "SOCAL", (void *)s)) {
|
||||
if (request_irq (irq, socal_intr, IRQF_SHARED, "SOCAL", (void *)s)) {
|
||||
socal_printk ("Cannot order irq %d to go\n", irq);
|
||||
socals = s->next;
|
||||
return;
|
||||
|
||||
@@ -318,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
|
||||
|
||||
if (i2c->irq != 0)
|
||||
if ((result = request_irq(i2c->irq, mpc_i2c_isr,
|
||||
SA_SHIRQ, "i2c-mpc", i2c)) < 0) {
|
||||
IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
|
||||
printk(KERN_ERR
|
||||
"i2c-mpc - failed to attach interrupt\n");
|
||||
goto fail_irq;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user