diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-07 17:04:16 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 17:19:11 -0400 |
commit | ec4665c46b11f6e444911ba73dddae6044dec909 (patch) | |
tree | 6eef5f7046753c864d9ec8e58eaa8f32b1b59ece /drivers/input/keyboard | |
parent | 5d7e7d479856f23eebc272128905a7ecada367fb (diff) |
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>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/davinci_keyscan.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/ep93xx_keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/jornada720_kbd.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/matrix_keypad.c | 1 | ||||
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/pxa930_rotary.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/w90p910_keypad.c | 2 |
9 files changed, 8 insertions, 9 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 7b404e5443ed..b570ed30e8a1 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
@@ -550,7 +550,7 @@ static int __devinit adp5588_probe(struct i2c_client *client, | |||
550 | } | 550 | } |
551 | 551 | ||
552 | error = request_irq(client->irq, adp5588_irq, | 552 | error = request_irq(client->irq, adp5588_irq, |
553 | IRQF_TRIGGER_FALLING | IRQF_DISABLED, | 553 | IRQF_TRIGGER_FALLING, |
554 | client->dev.driver->name, kpad); | 554 | client->dev.driver->name, kpad); |
555 | if (error) { | 555 | if (error) { |
556 | dev_err(&client->dev, "irq %d busy?\n", client->irq); | 556 | dev_err(&client->dev, "irq %d busy?\n", client->irq); |
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index cd89d17162a3..9d82b3aeff5e 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c | |||
@@ -271,7 +271,7 @@ static int __init davinci_ks_probe(struct platform_device *pdev) | |||
271 | } | 271 | } |
272 | 272 | ||
273 | error = request_irq(davinci_ks->irq, davinci_ks_interrupt, | 273 | error = request_irq(davinci_ks->irq, davinci_ks_interrupt, |
274 | IRQF_DISABLED, pdev->name, davinci_ks); | 274 | 0, pdev->name, davinci_ks); |
275 | if (error < 0) { | 275 | if (error < 0) { |
276 | dev_err(dev, "unable to register davinci key scan interrupt\n"); | 276 | dev_err(dev, "unable to register davinci key scan interrupt\n"); |
277 | goto fail5; | 277 | goto fail5; |
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index aa17e024d803..4662c5da8018 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c | |||
@@ -323,7 +323,7 @@ static int __devinit ep93xx_keypad_probe(struct platform_device *pdev) | |||
323 | platform_set_drvdata(pdev, keypad); | 323 | platform_set_drvdata(pdev, keypad); |
324 | 324 | ||
325 | err = request_irq(keypad->irq, ep93xx_keypad_irq_handler, | 325 | err = request_irq(keypad->irq, ep93xx_keypad_irq_handler, |
326 | IRQF_DISABLED, pdev->name, keypad); | 326 | 0, pdev->name, keypad); |
327 | if (err) | 327 | if (err) |
328 | goto failed_free_dev; | 328 | goto failed_free_dev; |
329 | 329 | ||
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index d92c15c39e68..4b093faf5786 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c | |||
@@ -510,7 +510,7 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev) | |||
510 | /* Ensure that the keypad will stay dormant until opened */ | 510 | /* Ensure that the keypad will stay dormant until opened */ |
511 | imx_keypad_inhibit(keypad); | 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 | pdev->name, keypad); | 514 | pdev->name, keypad); |
515 | if (error) { | 515 | if (error) { |
516 | dev_err(&pdev->dev, "failed to request IRQ\n"); | 516 | dev_err(&pdev->dev, "failed to request IRQ\n"); |
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index 2cd3e1d56ea4..0aa6740e60d0 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c | |||
@@ -129,7 +129,7 @@ static int __devinit jornada720_kbd_probe(struct platform_device *pdev) | |||
129 | 129 | ||
130 | err = request_irq(IRQ_GPIO0, | 130 | err = request_irq(IRQ_GPIO0, |
131 | jornada720_kbd_interrupt, | 131 | jornada720_kbd_interrupt, |
132 | IRQF_DISABLED | IRQF_TRIGGER_FALLING, | 132 | IRQF_TRIGGER_FALLING, |
133 | "jornadakbd", pdev); | 133 | "jornadakbd", pdev); |
134 | if (err) { | 134 | if (err) { |
135 | printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n"); | 135 | printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n"); |
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index b02e4268e18f..e2ae657717ea 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c | |||
@@ -343,7 +343,6 @@ static int __devinit init_matrix_gpio(struct platform_device *pdev, | |||
343 | for (i = 0; i < pdata->num_row_gpios; i++) { | 343 | for (i = 0; i < pdata->num_row_gpios; i++) { |
344 | err = request_irq(gpio_to_irq(pdata->row_gpios[i]), | 344 | err = request_irq(gpio_to_irq(pdata->row_gpios[i]), |
345 | matrix_keypad_interrupt, | 345 | matrix_keypad_interrupt, |
346 | IRQF_DISABLED | | ||
347 | IRQF_TRIGGER_RISING | | 346 | IRQF_TRIGGER_RISING | |
348 | IRQF_TRIGGER_FALLING, | 347 | IRQF_TRIGGER_FALLING, |
349 | "matrix-keypad", keypad); | 348 | "matrix-keypad", keypad); |
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 4b0ec35259a1..eca6ae63de14 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -535,7 +535,7 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) | |||
535 | input_dev->evbit[0] |= BIT_MASK(EV_REL); | 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 | pdev->name, keypad); | 539 | pdev->name, keypad); |
540 | if (error) { | 540 | if (error) { |
541 | dev_err(&pdev->dev, "failed to request IRQ\n"); | 541 | dev_err(&pdev->dev, "failed to request IRQ\n"); |
diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c index b7123a44b6ec..35451bf780c7 100644 --- a/drivers/input/keyboard/pxa930_rotary.c +++ b/drivers/input/keyboard/pxa930_rotary.c | |||
@@ -148,7 +148,7 @@ static int __devinit pxa930_rotary_probe(struct platform_device *pdev) | |||
148 | r->input_dev = input_dev; | 148 | r->input_dev = input_dev; |
149 | input_set_drvdata(input_dev, r); | 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 | "enhanced rotary", r); | 152 | "enhanced rotary", r); |
153 | if (err) { | 153 | if (err) { |
154 | dev_err(&pdev->dev, "failed to request IRQ\n"); | 154 | dev_err(&pdev->dev, "failed to request IRQ\n"); |
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index ee2bf6bcf291..318586dadacf 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c | |||
@@ -203,7 +203,7 @@ static int __devinit w90p910_keypad_probe(struct platform_device *pdev) | |||
203 | input_dev->keycode, input_dev->keybit); | 203 | input_dev->keycode, input_dev->keybit); |
204 | 204 | ||
205 | error = request_irq(keypad->irq, w90p910_keypad_irq_handler, | 205 | error = request_irq(keypad->irq, w90p910_keypad_irq_handler, |
206 | IRQF_DISABLED, pdev->name, keypad); | 206 | 0, pdev->name, keypad); |
207 | if (error) { | 207 | if (error) { |
208 | dev_err(&pdev->dev, "failed to request IRQ\n"); | 208 | dev_err(&pdev->dev, "failed to request IRQ\n"); |
209 | goto failed_put_clk; | 209 | goto failed_put_clk; |