Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: remove IRQF_DISABLED from drivers

This flag is a NOOP and can be removed now.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Yong Zhang and committed by
Dmitry Torokhov
ec4665c4 5d7e7d47

+19 -20
+1 -1
drivers/input/keyboard/adp5588-keys.c
··· 550 550 } 551 551 552 552 error = request_irq(client->irq, adp5588_irq, 553 - IRQF_TRIGGER_FALLING | IRQF_DISABLED, 553 + IRQF_TRIGGER_FALLING, 554 554 client->dev.driver->name, kpad); 555 555 if (error) { 556 556 dev_err(&client->dev, "irq %d busy?\n", client->irq);
+1 -1
drivers/input/keyboard/davinci_keyscan.c
··· 271 271 } 272 272 273 273 error = request_irq(davinci_ks->irq, davinci_ks_interrupt, 274 - IRQF_DISABLED, pdev->name, davinci_ks); 274 + 0, pdev->name, davinci_ks); 275 275 if (error < 0) { 276 276 dev_err(dev, "unable to register davinci key scan interrupt\n"); 277 277 goto fail5;
+1 -1
drivers/input/keyboard/ep93xx_keypad.c
··· 323 323 platform_set_drvdata(pdev, keypad); 324 324 325 325 err = request_irq(keypad->irq, ep93xx_keypad_irq_handler, 326 - IRQF_DISABLED, pdev->name, keypad); 326 + 0, pdev->name, keypad); 327 327 if (err) 328 328 goto failed_free_dev; 329 329
+1 -1
drivers/input/keyboard/imx_keypad.c
··· 510 510 /* Ensure that the keypad will stay dormant until opened */ 511 511 imx_keypad_inhibit(keypad); 512 512 513 - error = request_irq(irq, imx_keypad_irq_handler, IRQF_DISABLED, 513 + error = request_irq(irq, imx_keypad_irq_handler, 0, 514 514 pdev->name, keypad); 515 515 if (error) { 516 516 dev_err(&pdev->dev, "failed to request IRQ\n");
+1 -1
drivers/input/keyboard/jornada720_kbd.c
··· 129 129 130 130 err = request_irq(IRQ_GPIO0, 131 131 jornada720_kbd_interrupt, 132 - IRQF_DISABLED | IRQF_TRIGGER_FALLING, 132 + IRQF_TRIGGER_FALLING, 133 133 "jornadakbd", pdev); 134 134 if (err) { 135 135 printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n");
-1
drivers/input/keyboard/matrix_keypad.c
··· 343 343 for (i = 0; i < pdata->num_row_gpios; i++) { 344 344 err = request_irq(gpio_to_irq(pdata->row_gpios[i]), 345 345 matrix_keypad_interrupt, 346 - IRQF_DISABLED | 347 346 IRQF_TRIGGER_RISING | 348 347 IRQF_TRIGGER_FALLING, 349 348 "matrix-keypad", keypad);
+1 -1
drivers/input/keyboard/pxa27x_keypad.c
··· 535 535 input_dev->evbit[0] |= BIT_MASK(EV_REL); 536 536 } 537 537 538 - error = request_irq(irq, pxa27x_keypad_irq_handler, IRQF_DISABLED, 538 + error = request_irq(irq, pxa27x_keypad_irq_handler, 0, 539 539 pdev->name, keypad); 540 540 if (error) { 541 541 dev_err(&pdev->dev, "failed to request IRQ\n");
+1 -1
drivers/input/keyboard/pxa930_rotary.c
··· 148 148 r->input_dev = input_dev; 149 149 input_set_drvdata(input_dev, r); 150 150 151 - err = request_irq(irq, rotary_irq, IRQF_DISABLED, 151 + err = request_irq(irq, rotary_irq, 0, 152 152 "enhanced rotary", r); 153 153 if (err) { 154 154 dev_err(&pdev->dev, "failed to request IRQ\n");
+1 -1
drivers/input/keyboard/w90p910_keypad.c
··· 203 203 input_dev->keycode, input_dev->keybit); 204 204 205 205 error = request_irq(keypad->irq, w90p910_keypad_irq_handler, 206 - IRQF_DISABLED, pdev->name, keypad); 206 + 0, pdev->name, keypad); 207 207 if (error) { 208 208 dev_err(&pdev->dev, "failed to request IRQ\n"); 209 209 goto failed_put_clk;
+1 -1
drivers/input/misc/ixp4xx-beeper.c
··· 111 111 input_dev->event = ixp4xx_spkr_event; 112 112 113 113 err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, 114 - IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper", 114 + IRQF_NO_SUSPEND, "ixp4xx-beeper", 115 115 (void *) dev->id); 116 116 if (err) 117 117 goto err_free_device;
+1 -1
drivers/input/mouse/pxa930_trkball.c
··· 183 183 /* held the module in reset, will be enabled in open() */ 184 184 pxa930_trkball_disable(trkball); 185 185 186 - error = request_irq(irq, pxa930_trkball_interrupt, IRQF_DISABLED, 186 + error = request_irq(irq, pxa930_trkball_interrupt, 0, 187 187 pdev->name, trkball); 188 188 if (error) { 189 189 dev_err(&pdev->dev, "failed to request irq: %d\n", error);
+1 -1
drivers/input/mouse/synaptics_i2c.c
··· 570 570 "Requesting IRQ: %d\n", touch->client->irq); 571 571 572 572 ret = request_irq(touch->client->irq, synaptics_i2c_irq, 573 - IRQF_DISABLED|IRQ_TYPE_EDGE_FALLING, 573 + IRQ_TYPE_EDGE_FALLING, 574 574 DRIVER_NAME, touch); 575 575 if (ret) { 576 576 dev_warn(&touch->client->dev,
+1 -1
drivers/input/touchscreen/atmel_tsadcc.c
··· 229 229 goto err_release_mem; 230 230 } 231 231 232 - err = request_irq(ts_dev->irq, atmel_tsadcc_interrupt, IRQF_DISABLED, 232 + err = request_irq(ts_dev->irq, atmel_tsadcc_interrupt, 0, 233 233 pdev->dev.driver->name, ts_dev); 234 234 if (err) { 235 235 dev_err(&pdev->dev, "failed to allocate irq.\n");
+2 -2
drivers/input/touchscreen/h3600_ts_input.c
··· 396 396 set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); 397 397 398 398 if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, 399 - IRQF_SHARED | IRQF_DISABLED, "h3600_action", ts->dev)) { 399 + IRQF_SHARED, "h3600_action", ts->dev)) { 400 400 printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); 401 401 err = -EBUSY; 402 402 goto fail1; 403 403 } 404 404 405 405 if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, 406 - IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", ts->dev)) { 406 + IRQF_SHARED, "h3600_suspend", ts->dev)) { 407 407 printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); 408 408 err = -EBUSY; 409 409 goto fail2;
+1 -1
drivers/input/touchscreen/hp680_ts_input.c
··· 93 93 hp680_ts_dev->phys = "hp680_ts/input0"; 94 94 95 95 if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt, 96 - IRQF_DISABLED, MODNAME, 0) < 0) { 96 + 0, MODNAME, 0) < 0) { 97 97 printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n", 98 98 HP680_TS_IRQ); 99 99 err = -EBUSY;
+1 -1
drivers/input/touchscreen/jornada720_ts.c
··· 127 127 128 128 error = request_irq(IRQ_GPIO9, 129 129 jornada720_ts_interrupt, 130 - IRQF_DISABLED | IRQF_TRIGGER_RISING, 130 + IRQF_TRIGGER_RISING, 131 131 "HP7XX Touchscreen driver", pdev); 132 132 if (error) { 133 133 printk(KERN_INFO "HP7XX TS : Unable to acquire irq!\n");
+1 -1
drivers/input/touchscreen/lpc32xx_ts.c
··· 276 276 input_set_drvdata(input, tsc); 277 277 278 278 error = request_irq(tsc->irq, lpc32xx_ts_interrupt, 279 - IRQF_DISABLED, pdev->name, tsc); 279 + 0, pdev->name, tsc); 280 280 if (error) { 281 281 dev_err(&pdev->dev, "failed requesting interrupt\n"); 282 282 goto err_put_clock;
+1 -1
drivers/input/touchscreen/s3c2410_ts.c
··· 328 328 ts.shift = info->oversampling_shift; 329 329 ts.features = platform_get_device_id(pdev)->driver_data; 330 330 331 - ret = request_irq(ts.irq_tc, stylus_irq, IRQF_DISABLED, 331 + ret = request_irq(ts.irq_tc, stylus_irq, 0, 332 332 "s3c2410_ts_pen", ts.input); 333 333 if (ret) { 334 334 dev_err(dev, "cannot get TC interrupt\n");
+1 -1
drivers/input/touchscreen/w90p910_ts.c
··· 279 279 280 280 w90p910_ts->irq_num = platform_get_irq(pdev, 0); 281 281 if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt, 282 - IRQF_DISABLED, "w90p910ts", w90p910_ts)) { 282 + 0, "w90p910ts", w90p910_ts)) { 283 283 err = -EBUSY; 284 284 goto fail4; 285 285 }