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/touchscreen | |
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/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/atmel_tsadcc.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/h3600_ts_input.c | 4 | ||||
-rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/jornada720_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/lpc32xx_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/w90p910_ts.c | 2 |
7 files changed, 8 insertions, 8 deletions
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 | } |