From: Dirk Behme Date: Wed, 31 Jan 2007 19:11:36 +0000 (-0800) Subject: ARM: OMAP: Convert driver interrupt flags SA_* to IRQF_* X-Git-Tag: v2.6.21-omap1~135 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ba9ca80b6468c5500a84a5c5e84383a6925a0bc3;p=linux-2.6-omap-h63xx.git ARM: OMAP: Convert driver interrupt flags SA_* to IRQF_* Convert driver interrupt flags SA_* to IRQF_* Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c index ccf8a54c0e4..8442a960c37 100644 --- a/arch/arm/plat-omap/dsp/dsp_mem.c +++ b/arch/arm/plat-omap/dsp/dsp_mem.c @@ -2498,7 +2498,7 @@ int __init dsp_mem_init(void) /* * DSP MMU interrupt setup */ - ret = request_irq(omap_dsp->mmu_irq, dsp_mmu_interrupt, SA_INTERRUPT, + ret = request_irq(omap_dsp->mmu_irq, dsp_mmu_interrupt, IRQF_DISABLED, "dsp_mmu", &devid_mmu); if (ret) { printk(KERN_ERR diff --git a/arch/arm/plat-omap/sti/sti.c b/arch/arm/plat-omap/sti/sti.c index d44c30d66b8..e828860f037 100644 --- a/arch/arm/plat-omap/sti/sti.c +++ b/arch/arm/plat-omap/sti/sti.c @@ -376,7 +376,7 @@ static int __devinit sti_probe(struct platform_device *pdev) } ret = request_irq(platform_get_irq(pdev, 0), sti_interrupt, - SA_INTERRUPT, "sti", NULL); + IRQF_DISABLED, "sti", NULL); if (unlikely(ret != 0)) goto err_badirq; diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c index 45b432836ae..934400f6988 100644 --- a/drivers/cbus/tahvo-usb.c +++ b/drivers/cbus/tahvo-usb.c @@ -188,7 +188,7 @@ static int omap_otg_probe(struct device *dev) } return request_irq(tahvo_otg_dev->resource[1].start, - omap_otg_irq, SA_INTERRUPT, DRIVER_NAME, + omap_otg_irq, IRQF_DISABLED, DRIVER_NAME, &tahvo_usb_device); } diff --git a/drivers/char/omap-rtc.c b/drivers/char/omap-rtc.c index d57402f1077..f1b3fa3c953 100644 --- a/drivers/char/omap-rtc.c +++ b/drivers/char/omap-rtc.c @@ -117,7 +117,7 @@ static const unsigned char days_in_mo[] = {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* - * A very tiny interrupt handler. It runs with SA_INTERRUPT set. + * A very tiny interrupt handler. It runs with IRQF_DISABLED set. */ irqreturn_t rtc_interrupt(int irq, void *dev_id) @@ -484,14 +484,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) CMOS_WRITE(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); } - if (request_irq(omap_rtc_timer, rtc_interrupt, SA_INTERRUPT, + if (request_irq(omap_rtc_timer, rtc_interrupt, IRQF_DISABLED, pdev->name, NULL)) { pr_debug("%s: RTC timer interrupt IRQ%d is not free.\n", pdev->name, omap_rtc_timer); goto fail; } - if (request_irq(omap_rtc_alarm, rtc_interrupt, SA_INTERRUPT, + if (request_irq(omap_rtc_alarm, rtc_interrupt, IRQF_DISABLED, pdev->name, NULL)) { pr_debug("%s: RTC alarm interrupt IRQ%d is not free.\n", pdev->name, omap_rtc_alarm); diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 8e5585b71a1..e2717542e0e 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c @@ -927,7 +927,7 @@ static int otg_bind(struct isp1301 *isp) if (otg_dev) status = request_irq(otg_dev->resource[1].start, omap_otg_irq, - SA_INTERRUPT, DRIVER_NAME, isp); + IRQF_DISABLED, DRIVER_NAME, isp); else status = -ENODEV; @@ -1609,7 +1609,7 @@ fail1: isp->irq = OMAP_GPIO_IRQ(2); omap_request_gpio(2); omap_set_gpio_direction(2, 1); - isp->irq_type = SA_TRIGGER_FALLING; + isp->irq_type = IRQF_TRIGGER_FALLING; } if (machine_is_omap_h3()) { @@ -1618,7 +1618,7 @@ fail1: isp->irq = OMAP_GPIO_IRQ(14); omap_request_gpio(14); omap_set_gpio_direction(14, 1); - isp->irq_type = SA_TRIGGER_FALLING; + isp->irq_type = IRQF_TRIGGER_FALLING; } if (machine_is_omap_h4()) { diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index d780d5c4f27..b9510f35789 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c @@ -849,7 +849,7 @@ static int menelaus_probe(struct i2c_adapter *adapter, int address, int kind) /* Set output buffer strengths */ menelaus_write_reg(MENELAUS_MCT_CTRL1, 0x73); - err = request_irq(menelaus.irq, menelaus_irq, SA_INTERRUPT, + err = request_irq(menelaus.irq, menelaus_irq, IRQF_DISABLED, DRIVER_NAME, &menelaus); if (err) { printk(KERN_ERR "Could not get Menelaus IRQ\n"); diff --git a/drivers/i2c/chips/twl4030_core.c b/drivers/i2c/chips/twl4030_core.c index 961b3ba42e4..31340642ce1 100644 --- a/drivers/i2c/chips/twl4030_core.c +++ b/drivers/i2c/chips/twl4030_core.c @@ -420,7 +420,7 @@ static void do_twl4030_module_irq(unsigned int irq, irq_desc_t *desc) action = action->next; } while (action); - if (status & SA_SAMPLE_RANDOM) + if (status & IRQF_SAMPLE_RANDOM) add_interrupt_randomness(irq); local_irq_disable(); diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c index 4fa6cb3d71a..0f95f9f1b56 100644 --- a/drivers/input/keyboard/innovator_ps2.c +++ b/drivers/input/keyboard/innovator_ps2.c @@ -1108,7 +1108,7 @@ innovator_hid_open(struct input_dev *dev) return 0; if (request_irq(OMAP1510_INT_FPGA_ATN, (void *) innovator_hid_interrupt, - SA_INTERRUPT, PFX, hid) < 0) + IRQF_DISABLED, PFX, hid) < 0) return -EINVAL; return 0; diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 18e85a3441f..0c496d5d195 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -897,7 +897,7 @@ static int __devinit ads7846_probe(struct spi_device *spi) ts->last_msg = m; if (request_irq(spi->irq, ads7846_irq, - SA_SAMPLE_RANDOM | SA_TRIGGER_FALLING, + IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING, spi->dev.bus_id, ts)) { dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); err = -EBUSY; diff --git a/drivers/input/touchscreen/omap/omap_ts.c b/drivers/input/touchscreen/omap/omap_ts.c index 8a930d888fe..14dfc6afe26 100644 --- a/drivers/input/touchscreen/omap/omap_ts.c +++ b/drivers/input/touchscreen/omap/omap_ts.c @@ -157,7 +157,7 @@ static int __init omap_ts_probe(struct platform_device *pdev) /* request irq */ if (ts_omap.irq != -1) { if (request_irq(ts_omap.irq, omap_ts_handler, - SA_SAMPLE_RANDOM | ts_omap.irq_type, + IRQF_SAMPLE_RANDOM | ts_omap.irq_type, OMAP_TS_NAME, &ts_omap)) { printk(KERN_ERR "omap_ts.c: Could not allocate touchscreen IRQ!\n"); diff --git a/drivers/input/touchscreen/omap/ts_hx.c b/drivers/input/touchscreen/omap/ts_hx.c index f148f19765e..9f82f5afc21 100644 --- a/drivers/input/touchscreen/omap/ts_hx.c +++ b/drivers/input/touchscreen/omap/ts_hx.c @@ -98,7 +98,7 @@ static int __init hx_ts_probe(struct omap_ts_t *ts) }; omap_set_gpio_direction(gpio, 1); - ts->irq_type = SA_TRIGGER_FALLING; + ts->irq_type = IRQF_TRIGGER_FALLING; return 0; } diff --git a/drivers/media/video/omap/omap16xxcam.c b/drivers/media/video/omap/omap16xxcam.c index 3b8065891f2..34cf1a67110 100644 --- a/drivers/media/video/omap/omap16xxcam.c +++ b/drivers/media/video/omap/omap16xxcam.c @@ -475,7 +475,7 @@ omap16xxcam_open(void *priv) struct omap16xxcam *data = (struct omap16xxcam *) priv; int ret; - if ((ret = request_irq(INT_CAMERA, omap16xx_cam_isr, SA_INTERRUPT, + if ((ret = request_irq(INT_CAMERA, omap16xx_cam_isr, IRQF_DISABLED, "camera", data))) { printk("FAILED to aquire irq\n"); return ret; diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index d59880d44fb..9de8d67f4f8 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -417,13 +417,13 @@ static int __devinit omap_rtc_probe(struct platform_device *pdev) rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); /* handle periodic and alarm irqs */ - if (request_irq(omap_rtc_timer, rtc_irq, SA_INTERRUPT, + if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED, rtc->class_dev.class_id, &rtc->class_dev)) { pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", pdev->name, omap_rtc_timer); goto fail0; } - if (request_irq(omap_rtc_alarm, rtc_irq, SA_INTERRUPT, + if (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED, rtc->class_dev.class_id, &rtc->class_dev)) { pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", pdev->name, omap_rtc_alarm); diff --git a/drivers/spi/tsc2102.c b/drivers/spi/tsc2102.c index 91d4d214ecb..130b1c22dab 100644 --- a/drivers/spi/tsc2102.c +++ b/drivers/spi/tsc2102.c @@ -1033,8 +1033,8 @@ static int tsc2102_probe(struct spi_device *spi) clk_enable(tsc.bclk_ck); - if (request_irq(spi->irq, tsc2102_handler, SA_SAMPLE_RANDOM | - SA_TRIGGER_FALLING, "tsc2102", &tsc)) { + if (request_irq(spi->irq, tsc2102_handler, IRQF_SAMPLE_RANDOM | + IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) { printk(KERN_ERR "Could not allocate touchscreen IRQ!\n"); err = -EINVAL; goto err_clk; diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 41a9448541a..ea39d0ce293 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -382,7 +382,7 @@ dma_controller_create(struct musb *pThis, void __iomem *pCoreBase) pController->Controller.channel_program = hsdma_channel_program; pController->Controller.channel_abort = hsdma_channel_abort; - if (request_irq(irq, hsdma_irq, SA_INTERRUPT, + if (request_irq(irq, hsdma_irq, IRQF_DISABLED, pThis->controller->bus_id, &pController->Controller)) { dev_err(dev, "request_irq %d failed!\n", irq); kfree(pController);