aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/adp5588-keys.c2
-rw-r--r--drivers/input/keyboard/davinci_keyscan.c2
-rw-r--r--drivers/input/keyboard/ep93xx_keypad.c2
-rw-r--r--drivers/input/keyboard/imx_keypad.c2
-rw-r--r--drivers/input/keyboard/jornada720_kbd.c2
-rw-r--r--drivers/input/keyboard/matrix_keypad.c1
-rw-r--r--drivers/input/keyboard/pxa27x_keypad.c2
-rw-r--r--drivers/input/keyboard/pxa930_rotary.c2
-rw-r--r--drivers/input/keyboard/w90p910_keypad.c2
-rw-r--r--drivers/input/misc/ixp4xx-beeper.c2
-rw-r--r--drivers/input/mouse/pxa930_trkball.c2
-rw-r--r--drivers/input/mouse/synaptics_i2c.c2
-rw-r--r--drivers/input/touchscreen/atmel_tsadcc.c2
-rw-r--r--drivers/input/touchscreen/h3600_ts_input.c4
-rw-r--r--drivers/input/touchscreen/hp680_ts_input.c2
-rw-r--r--drivers/input/touchscreen/jornada720_ts.c2
-rw-r--r--drivers/input/touchscreen/lpc32xx_ts.c2
-rw-r--r--drivers/input/touchscreen/s3c2410_ts.c2
-rw-r--r--drivers/input/touchscreen/w90p910_ts.c2
19 files changed, 19 insertions, 20 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;
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 1f38302a5951..302ab46ce752 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -111,7 +111,7 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
111 input_dev->event = ixp4xx_spkr_event; 111 input_dev->event = ixp4xx_spkr_event;
112 112
113 err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, 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 (void *) dev->id); 115 (void *) dev->id);
116 if (err) 116 if (err)
117 goto err_free_device; 117 goto err_free_device;
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c
index 6c5d84fcdea1..ee3b0ca9d592 100644
--- a/drivers/input/mouse/pxa930_trkball.c
+++ b/drivers/input/mouse/pxa930_trkball.c
@@ -183,7 +183,7 @@ static int __devinit pxa930_trkball_probe(struct platform_device *pdev)
183 /* held the module in reset, will be enabled in open() */ 183 /* held the module in reset, will be enabled in open() */
184 pxa930_trkball_disable(trkball); 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 pdev->name, trkball); 187 pdev->name, trkball);
188 if (error) { 188 if (error) {
189 dev_err(&pdev->dev, "failed to request irq: %d\n", error); 189 dev_err(&pdev->dev, "failed to request irq: %d\n", error);
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c
index cba3c84d2f21..e28e9ce0f7eb 100644
--- a/drivers/input/mouse/synaptics_i2c.c
+++ b/drivers/input/mouse/synaptics_i2c.c
@@ -570,7 +570,7 @@ static int __devinit synaptics_i2c_probe(struct i2c_client *client,
570 "Requesting IRQ: %d\n", touch->client->irq); 570 "Requesting IRQ: %d\n", touch->client->irq);
571 571
572 ret = request_irq(touch->client->irq, synaptics_i2c_irq, 572 ret = request_irq(touch->client->irq, synaptics_i2c_irq,
573 IRQF_DISABLED|IRQ_TYPE_EDGE_FALLING, 573 IRQ_TYPE_EDGE_FALLING,
574 DRIVER_NAME, touch); 574 DRIVER_NAME, touch);
575 if (ret) { 575 if (ret) {
576 dev_warn(&touch->client->dev, 576 dev_warn(&touch->client->dev,
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index 432c69be6ac6..122a87883659 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -229,7 +229,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
229 goto err_release_mem; 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 pdev->dev.driver->name, ts_dev); 233 pdev->dev.driver->name, ts_dev);
234 if (err) { 234 if (err) {
235 dev_err(&pdev->dev, "failed to allocate irq.\n"); 235 dev_err(&pdev->dev, "failed to allocate irq.\n");
diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
index 211811ae5525..6107e563e681 100644
--- a/drivers/input/touchscreen/h3600_ts_input.c
+++ b/drivers/input/touchscreen/h3600_ts_input.c
@@ -396,14 +396,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
396 set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE); 396 set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);
397 397
398 if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler, 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 printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n"); 400 printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
401 err = -EBUSY; 401 err = -EBUSY;
402 goto fail1; 402 goto fail1;
403 } 403 }
404 404
405 if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler, 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 printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n"); 407 printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
408 err = -EBUSY; 408 err = -EBUSY;
409 goto fail2; 409 goto fail2;
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index dd4e8f020b99..639a6044183d 100644
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -93,7 +93,7 @@ static int __init hp680_ts_init(void)
93 hp680_ts_dev->phys = "hp680_ts/input0"; 93 hp680_ts_dev->phys = "hp680_ts/input0";
94 94
95 if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt, 95 if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
96 IRQF_DISABLED, MODNAME, 0) < 0) { 96 0, MODNAME, 0) < 0) {
97 printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n", 97 printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
98 HP680_TS_IRQ); 98 HP680_TS_IRQ);
99 err = -EBUSY; 99 err = -EBUSY;
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 4b0a061811ff..50076c2d59e2 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -127,7 +127,7 @@ static int __devinit jornada720_ts_probe(struct platform_device *pdev)
127 127
128 error = request_irq(IRQ_GPIO9, 128 error = request_irq(IRQ_GPIO9,
129 jornada720_ts_interrupt, 129 jornada720_ts_interrupt,
130 IRQF_DISABLED | IRQF_TRIGGER_RISING, 130 IRQF_TRIGGER_RISING,
131 "HP7XX Touchscreen driver", pdev); 131 "HP7XX Touchscreen driver", pdev);
132 if (error) { 132 if (error) {
133 printk(KERN_INFO "HP7XX TS : Unable to acquire irq!\n"); 133 printk(KERN_INFO "HP7XX TS : Unable to acquire irq!\n");
diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c
index dcf803f5a1f7..0a484ed5295c 100644
--- a/drivers/input/touchscreen/lpc32xx_ts.c
+++ b/drivers/input/touchscreen/lpc32xx_ts.c
@@ -276,7 +276,7 @@ static int __devinit lpc32xx_ts_probe(struct platform_device *pdev)
276 input_set_drvdata(input, tsc); 276 input_set_drvdata(input, tsc);
277 277
278 error = request_irq(tsc->irq, lpc32xx_ts_interrupt, 278 error = request_irq(tsc->irq, lpc32xx_ts_interrupt,
279 IRQF_DISABLED, pdev->name, tsc); 279 0, pdev->name, tsc);
280 if (error) { 280 if (error) {
281 dev_err(&pdev->dev, "failed requesting interrupt\n"); 281 dev_err(&pdev->dev, "failed requesting interrupt\n");
282 goto err_put_clock; 282 goto err_put_clock;
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 8feb7f3c8be1..64ce697a3456 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -328,7 +328,7 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev)
328 ts.shift = info->oversampling_shift; 328 ts.shift = info->oversampling_shift;
329 ts.features = platform_get_device_id(pdev)->driver_data; 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 "s3c2410_ts_pen", ts.input); 332 "s3c2410_ts_pen", ts.input);
333 if (ret) { 333 if (ret) {
334 dev_err(dev, "cannot get TC interrupt\n"); 334 dev_err(dev, "cannot get TC interrupt\n");
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index 7a45d68c3516..217aa51135c5 100644
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -279,7 +279,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev)
279 279
280 w90p910_ts->irq_num = platform_get_irq(pdev, 0); 280 w90p910_ts->irq_num = platform_get_irq(pdev, 0);
281 if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt, 281 if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt,
282 IRQF_DISABLED, "w90p910ts", w90p910_ts)) { 282 0, "w90p910ts", w90p910_ts)) {
283 err = -EBUSY; 283 err = -EBUSY;
284 goto fail4; 284 goto fail4;
285 } 285 }