Commit dace1453 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

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

Signed-off-by: default avatarThomas 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8076fe32
...@@ -1278,7 +1278,7 @@ static int mfm_do_init(unsigned char irqmask) ...@@ -1278,7 +1278,7 @@ static int mfm_do_init(unsigned char irqmask)
printk("mfm: detected %d hard drive%s\n", mfm_drives, printk("mfm: detected %d hard drive%s\n", mfm_drives,
mfm_drives == 1 ? "" : "s"); 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) { if (ret) {
printk("mfm: unable to get IRQ%d\n", mfm_irq); printk("mfm: unable to get IRQ%d\n", mfm_irq);
goto out4; goto out4;
......
...@@ -280,7 +280,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler, ...@@ -280,7 +280,7 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
acpi_irq_handler = handler; acpi_irq_handler = handler;
acpi_irq_context = context; 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); printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
return AE_NOT_ACQUIRED; return AE_NOT_ACQUIRED;
} }
......
...@@ -2286,7 +2286,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_ ...@@ -2286,7 +2286,7 @@ static int __devinit amb_probe(struct pci_dev *pci_dev, const struct pci_device_
setup_pci_dev(pci_dev); setup_pci_dev(pci_dev);
// grab (but share) IRQ and install handler // 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) { if (err < 0) {
PRINTK (KERN_ERR, "request IRQ failed!"); PRINTK (KERN_ERR, "request IRQ failed!");
goto out_reset; goto out_reset;
......
...@@ -1797,7 +1797,7 @@ static int __devinit eni_start(struct atm_dev *dev) ...@@ -1797,7 +1797,7 @@ static int __devinit eni_start(struct atm_dev *dev)
DPRINTK(">eni_start\n"); DPRINTK(">eni_start\n");
eni_dev = ENI_DEV(dev); 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", printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
dev->number,eni_dev->irq); dev->number,eni_dev->irq);
error = -EAGAIN; error = -EAGAIN;
......
...@@ -1829,7 +1829,7 @@ static int __devinit fs_init (struct fs_dev *dev) ...@@ -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); init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);
dev->irq = pci_dev->irq; 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); printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);
/* XXX undo all previous stuff... */ /* XXX undo all previous stuff... */
return 1; return 1;
......
...@@ -2123,7 +2123,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags) ...@@ -2123,7 +2123,7 @@ fore200e_change_qos(struct atm_vcc* vcc,struct atm_qos* qos, int flags)
static int __devinit static int __devinit
fore200e_irq_request(struct fore200e* fore200e) 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", printk(FORE200E "unable to reserve IRQ %s for device %s\n",
fore200e_irq_itoa(fore200e->irq), fore200e->name); fore200e_irq_itoa(fore200e->irq), fore200e->name);
......
...@@ -1007,7 +1007,7 @@ he_init_irq(struct he_dev *he_dev) ...@@ -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_54_MAP);
he_writel(he_dev, 0x0, GRP_76_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); hprintk("irq %d already in use\n", he_dev->pci_dev->irq);
return -EINVAL; return -EINVAL;
} }
......
...@@ -2735,7 +2735,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ ...@@ -2735,7 +2735,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_
irq = pci_dev->irq; irq = pci_dev->irq;
if (request_irq(irq, if (request_irq(irq,
interrupt_handler, interrupt_handler,
SA_SHIRQ, /* irqflags guess */ IRQF_SHARED, /* irqflags guess */
DEV_LABEL, /* name guess */ DEV_LABEL, /* name guess */
dev)) { dev)) {
PRINTD(DBG_WARN, "request IRQ failed!"); PRINTD(DBG_WARN, "request IRQ failed!");
......
...@@ -3386,7 +3386,7 @@ init_card(struct atm_dev *dev) ...@@ -3386,7 +3386,7 @@ init_card(struct atm_dev *dev)
writel(SAR_STAT_TMROF, SAR_REG_STAT); writel(SAR_STAT_TMROF, SAR_REG_STAT);
} }
IPRINTK("%s: Request IRQ ... ", card->name); 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) { card->name, card) != 0) {
printk("%s: can't allocate IRQ.\n", card->name); printk("%s: can't allocate IRQ.\n", card->name);
deinit_card(card); deinit_card(card);
......
...@@ -2488,7 +2488,7 @@ static int __devinit ia_start(struct atm_dev *dev) ...@@ -2488,7 +2488,7 @@ static int __devinit ia_start(struct atm_dev *dev)
u32 ctrl_reg; u32 ctrl_reg;
IF_EVENT(printk(">ia_start\n");) IF_EVENT(printk(">ia_start\n");)
iadev = INPH_IA_DEV(dev); 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", printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
dev->number, iadev->irq); dev->number, iadev->irq);
error = -EAGAIN; error = -EAGAIN;
......
...@@ -2240,7 +2240,7 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev) ...@@ -2240,7 +2240,7 @@ static int __devinit lanai_dev_open(struct atm_dev *atmdev)
conf2_write(lanai); conf2_write(lanai);
reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg); reg_write(lanai, TX_FIFO_DEPTH, TxDepth_Reg);
reg_write(lanai, 0, CBR_ICG_Reg); /* CBR defaults to no limit */ 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) { DEV_LABEL, lanai)) != 0) {
printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n"); printk(KERN_ERR DEV_LABEL ": can't allocate interrupt\n");
goto error_vcctable; goto error_vcctable;
......
...@@ -625,7 +625,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) ...@@ -625,7 +625,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
if (mac[i] == NULL) if (mac[i] == NULL)
nicstar_init_eprom(card->membase); 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); printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
error = 9; error = 9;
......
...@@ -1270,7 +1270,7 @@ static int __init zatm_start(struct atm_dev *dev) ...@@ -1270,7 +1270,7 @@ static int __init zatm_start(struct atm_dev *dev)
zatm_dev->rx_map = zatm_dev->tx_map = NULL; zatm_dev->rx_map = zatm_dev->tx_map = NULL;
for (i = 0; i < NR_MBX; i++) for (i = 0; i < NR_MBX; i++)
zatm_dev->mbx_start[i] = 0; 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) { if (error < 0) {
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n", printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
dev->number,zatm_dev->irq); dev->number,zatm_dev->irq);
......
...@@ -3141,7 +3141,7 @@ int __init cdu31a_init(void) ...@@ -3141,7 +3141,7 @@ int __init cdu31a_init(void)
if (cdu31a_irq > 0) { if (cdu31a_irq > 0) {
if (request_irq if (request_irq
(cdu31a_irq, cdu31a_interrupt, SA_INTERRUPT, (cdu31a_irq, cdu31a_interrupt, IRQF_DISABLED,
"cdu31a", NULL)) { "cdu31a", NULL)) {
printk(KERN_WARNING PFX "Unable to grab IRQ%d for " printk(KERN_WARNING PFX "Unable to grab IRQ%d for "
"the CDU31A driver\n", cdu31a_irq); "the CDU31A driver\n", cdu31a_irq);
......
...@@ -1193,7 +1193,7 @@ static int __init mcdx_init_drive(int drive) ...@@ -1193,7 +1193,7 @@ static int __init mcdx_init_drive(int drive)
} }
xtrace(INIT, "init() subscribe irq and i/o\n"); 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); release_region(stuffp->wreg_data, MCDX_IO_SIZE);
xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n", xwarn("%s=0x%03x,%d: Init failed. Can't get irq (%d).\n",
MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq); MCDX, stuffp->wreg_data, stuffp->irq, stuffp->irq);
......
...@@ -1527,7 +1527,7 @@ static int __init sony535_init(void) ...@@ -1527,7 +1527,7 @@ static int __init sony535_init(void)
} }
if (sony535_irq_used > 0) { if (sony535_irq_used > 0) {
if (request_irq(sony535_irq_used, cdu535_interrupt, 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 printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME
" driver; polling instead.\n", sony535_irq_used); " driver; polling instead.\n", sony535_irq_used);
sony535_irq_used = 0; sony535_irq_used = 0;
......
...@@ -739,7 +739,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev, ...@@ -739,7 +739,7 @@ static int __devinit ioat_probe(struct pci_dev *pdev,
device->msi = 0; device->msi = 0;
} }
#endif #endif
err = request_irq(pdev->irq, &ioat_do_interrupt, SA_SHIRQ, "ioat", err = request_irq(pdev->irq, &ioat_do_interrupt, IRQF_SHARED, "ioat",
device); device);
if (err) if (err)
goto err_irq; goto err_irq;
......
...@@ -637,7 +637,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no) ...@@ -637,7 +637,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no)
irq = sdev->irqs[0]; 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); soc_printk ("Cannot order irq %d to go\n", irq);
socs = s->next; socs = s->next;
return; return;
......
...@@ -761,7 +761,7 @@ static inline void socal_init(struct sbus_dev *sdev, int no) ...@@ -761,7 +761,7 @@ static inline void socal_init(struct sbus_dev *sdev, int no)
irq = sdev->irqs[0]; 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); socal_printk ("Cannot order irq %d to go\n", irq);
socals = s->next; socals = s->next;
return; return;
......
...@@ -318,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev) ...@@ -318,7 +318,7 @@ static int fsl_i2c_probe(struct platform_device *pdev)
if (i2c->irq != 0) if (i2c->irq != 0)
if ((result = request_irq(i2c->irq, mpc_i2c_isr, if ((result = request_irq(i2c->irq, mpc_i2c_isr,
SA_SHIRQ, "i2c-mpc", i2c)) < 0) { IRQF_SHARED, "i2c-mpc", i2c)) < 0) {
printk(KERN_ERR printk(KERN_ERR
"i2c-mpc - failed to attach interrupt\n"); "i2c-mpc - failed to attach interrupt\n");
goto fail_irq; goto fail_irq;
......
...@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct platform_device *dev) ...@@ -968,7 +968,7 @@ static int i2c_pxa_probe(struct platform_device *dev)
#endif #endif
pxa_set_cken(CKEN14_I2C, 1); pxa_set_cken(CKEN14_I2C, 1);
ret = request_irq(IRQ_I2C, i2c_pxa_handler, SA_INTERRUPT, ret = request_irq(IRQ_I2C, i2c_pxa_handler, IRQF_DISABLED,
"pxa2xx-i2c", i2c); "pxa2xx-i2c", i2c);
if (ret) if (ret)
goto out; goto out;
......
...@@ -828,7 +828,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) ...@@ -828,7 +828,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
goto out; goto out;
} }
ret = request_irq(res->start, s3c24xx_i2c_irq, SA_INTERRUPT, ret = request_irq(res->start, s3c24xx_i2c_irq, IRQF_DISABLED,
pdev->name, i2c); pdev->name, i2c);
if (ret != 0) { if (ret != 0) {
......
...@@ -908,7 +908,7 @@ static int otg_bind(struct isp1301 *isp) ...@@ -908,7 +908,7 @@ static int otg_bind(struct isp1301 *isp)
if (otg_dev) if (otg_dev)
status = request_irq(otg_dev->resource[1].start, omap_otg_irq, status = request_irq(otg_dev->resource[1].start, omap_otg_irq,
SA_INTERRUPT, DRIVER_NAME, isp); IRQF_DISABLED, DRIVER_NAME, isp);
else else
status = -ENODEV; status = -ENODEV;
...@@ -1578,7 +1578,7 @@ fail1: ...@@ -1578,7 +1578,7 @@ fail1:
} }
status = request_irq(isp->irq, isp1301_irq, status = request_irq(isp->irq, isp1301_irq,
SA_SAMPLE_RANDOM, DRIVER_NAME, isp); IRQF_SAMPLE_RANDOM, DRIVER_NAME, isp);
if (status < 0) { if (status < 0) {
dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n", dev_dbg(&i2c->dev, "can't get IRQ %d, err %d\n",
isp->irq, status); isp->irq, status);
......
...@@ -521,14 +521,14 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) ...@@ -521,14 +521,14 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
} }
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
irqflags = SA_SAMPLE_RANDOM | SA_TRIGGER_LOW; irqflags = IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_LOW;
if (machine_is_omap_h2()) { if (machine_is_omap_h2()) {
tps->model = TPS65010; tps->model = TPS65010;
omap_cfg_reg(W4_GPIO58); omap_cfg_reg(W4_GPIO58);
tps->irq = OMAP_GPIO_IRQ(58); tps->irq = OMAP_GPIO_IRQ(58);
omap_request_gpio(58); omap_request_gpio(58);
omap_set_gpio_direction(58, 1); omap_set_gpio_direction(58, 1);
irqflags |= SA_TRIGGER_FALLING; irqflags |= IRQF_TRIGGER_FALLING;
} }
if (machine_is_omap_osk()) { if (machine_is_omap_osk()) {
tps->model = TPS65010; tps->model = TPS65010;
...@@ -536,7 +536,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) ...@@ -536,7 +536,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1)); tps->irq = OMAP_GPIO_IRQ(OMAP_MPUIO(1));
omap_request_gpio(OMAP_MPUIO(1)); omap_request_gpio(OMAP_MPUIO(1));
omap_set_gpio_direction(OMAP_MPUIO(1), 1); omap_set_gpio_direction(OMAP_MPUIO(1), 1);
irqflags |= SA_TRIGGER_FALLING; irqflags |= IRQF_TRIGGER_FALLING;
} }
if (machine_is_omap_h3()) { if (machine_is_omap_h3()) {
tps->model = TPS65013; tps->model = TPS65013;
...@@ -544,7 +544,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind) ...@@ -544,7 +544,7 @@ tps65010_probe(struct i2c_adapter *bus, int address, int kind)
// FIXME set up this board's IRQ ... // FIXME set up this board's IRQ ...
} }
#else #else
irqflags = SA_SAMPLE_RANDOM; irqflags = IRQF_SAMPLE_RANDOM;
#endif #endif
if (tps->irq > 0) { if (tps->irq > 0) {
......
...@@ -468,7 +468,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, ...@@ -468,7 +468,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
"continuing anyway\n"); "continuing anyway\n");
/* /*
* set up our interrupt handler; SA_SHIRQ probably not needed, * set up our interrupt handler; IRQF_SHARED probably not needed,
* since MSI interrupts shouldn't be shared but won't hurt for now. * since MSI interrupts shouldn't be shared but won't hurt for now.
* check 0 irq after we return from chip-specific bus setup, since * check 0 irq after we return from chip-specific bus setup, since
* that can affect this due to setup * that can affect this due to setup
...@@ -477,7 +477,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, ...@@ -477,7 +477,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
ipath_dev_err(dd, "irq is 0, BIOS error? Interrupts won't " ipath_dev_err(dd, "irq is 0, BIOS error? Interrupts won't "
"work\n"); "work\n");
else { else {
ret = request_irq(pdev->irq, ipath_intr, SA_SHIRQ, ret = request_irq(pdev->irq, ipath_intr, IRQF_SHARED,
IPATH_DRV_NAME, dd); IPATH_DRV_NAME, dd);
if (ret) { if (ret) {
ipath_dev_err(dd, "Couldn't setup irq handler, " ipath_dev_err(dd, "Couldn't setup irq handler, "
......
...@@ -900,7 +900,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev) ...@@ -900,7 +900,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev)
mthca_is_memfree(dev) ? mthca_is_memfree(dev) ?
mthca_arbel_interrupt : mthca_arbel_interrupt :
mthca_tavor_interrupt, mthca_tavor_interrupt,
SA_SHIRQ, DRV_NAME, dev); IRQF_SHARED, DRV_NAME, dev);
if (err) if (err)
goto err_out_cmd; goto err_out_cmd;
dev->eq_table.have_irq = 1; dev->eq_table.have_irq = 1;
......
...@@ -352,7 +352,7 @@ static int __init corgikbd_probe(struct platform_device *pdev) ...@@ -352,7 +352,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) { for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN); pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);
if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt, if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,
SA_INTERRUPT | SA_TRIGGER_RISING, IRQF_DISABLED | IRQF_TRIGGER_RISING,
"corgikbd", corgikbd)) "corgikbd", corgikbd))
printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i); printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);
} }
......
...@@ -410,7 +410,7 @@ static int __init spitzkbd_probe(struct platform_device *dev) ...@@ -410,7 +410,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)
for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) { for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) {
pxa_gpio_mode(spitz_senses[i] | GPIO_IN); pxa_gpio_mode(spitz_senses[i] | GPIO_IN);
if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt, if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt,
SA_INTERRUPT|SA_TRIGGER_RISING, IRQF_DISABLED|IRQF_TRIGGER_RISING,
"Spitzkbd Sense", spitzkbd)) "Spitzkbd Sense", spitzkbd))
printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i); printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i);
} }
...@@ -425,19 +425,19 @@ static int __init spitzkbd_probe(struct platform_device *dev) ...@@ -425,19 +425,19 @@ static int __init spitzkbd_probe(struct platform_device *dev)
pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN); pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN);
request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt, request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt,
SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Spitzkbd Sync", spitzkbd); "Spitzkbd Sync", spitzkbd);
request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt, request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt,
SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Spitzkbd PwrOn", spitzkbd); "Spitzkbd PwrOn", spitzkbd);
request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr, request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr,
SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Spitzkbd SWA", spitzkbd); "Spitzkbd SWA", spitzkbd);
request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr,
SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Spitzkbd SWB", spitzkbd); "Spitzkbd SWB", spitzkbd);
request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr,
SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"Spitzkbd HP", spitzkbd); "Spitzkbd HP", spitzkbd);
printk(KERN_INFO "input: Spitz Keyboard Registered\n"); printk(KERN_INFO "input: Spitz Keyboard Registered\n");
......
...@@ -113,7 +113,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) ...@@ -113,7 +113,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
input_dev->event = ixp4xx_spkr_event; input_dev->event = ixp4xx_spkr_event;
err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
SA_INTERRUPT | SA_TIMER, "ixp4xx-beeper", (void *) dev->id); IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id);
if (err) if (err)
goto err_free_device; goto err_free_device;
......
...@@ -85,7 +85,7 @@ static int __init rpcmouse_init(void) ...@@ -85,7 +85,7 @@ static int __init rpcmouse_init(void)
rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX); rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);
rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY); rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);
if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, SA_SHIRQ, "rpcmouse", rpcmouse_dev)) { if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, IRQF_SHARED, "rpcmouse", rpcmouse_dev)) {
printk(KERN_ERR "rpcmouse: unable to allocate VSYNC interrupt\n"); printk(KERN_ERR "rpcmouse: unable to allocate VSYNC interrupt\n");
input_free_device(rpcmouse_dev); input_free_device(rpcmouse_dev);
return -EBUSY; return -EBUSY;
......
...@@ -370,7 +370,7 @@ static int __init gscps2_probe(struct parisc_device *dev) ...@@ -370,7 +370,7 @@ static int __init gscps2_probe(struct parisc_device *dev)
serio->dev.parent = &dev->dev; serio->dev.parent = &dev->dev;
ret = -EBUSY; ret = -EBUSY;
if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->port->name, ps2port)) if (request_irq(dev->irq, gscps2_interrupt, IRQF_SHARED, ps2port->port->name, ps2port))
goto fail_miserably; goto fail_miserably;
if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) { if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {
......
...@@ -328,7 +328,7 @@ static int i8042_open(struct serio *serio) ...@@ -328,7 +328,7 @@ static int i8042_open(struct serio *serio)
return 0; return 0;
if (request_irq(port->irq, i8042_interrupt, if (request_irq(port->irq, i8042_interrupt,
SA_SHIRQ, "i8042", i8042_request_irq_cookie)) { IRQF_SHARED, "i8042", i8042_request_irq_cookie)) {
printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port->irq, port->name); printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port->irq, port->name);
goto irq_fail; goto irq_fail;
} }
...@@ -610,7 +610,7 @@ static int __devinit i8042_check_aux(void) ...@@ -610,7 +610,7 @@ static int __devinit i8042_check_aux(void)
*/ */
if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt, if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt,
SA_SHIRQ, "i8042", &i8042_check_aux_cookie)) IRQF_SHARED, "i8042", &i8042_check_aux_cookie))
return -1; return -1;
free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &i8042_check_aux_cookie); free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &i8042_check_aux_cookie);
......
...@@ -107,7 +107,7 @@ static int pcips2_open(struct serio *io) ...@@ -107,7 +107,7 @@ static int pcips2_open(struct serio *io)
outb(PS2_CTRL_ENABLE, ps2if->base); outb(PS2_CTRL_ENABLE, ps2if->base);
pcips2_flush_input(p