Commit bcd9730a authored by Barry Song's avatar Barry Song Committed by Dmitry Torokhov

Input: move to use request_irq by IRQF_NO_AUTOEN flag

disable_irq() after request_irq() still has a time gap in which
interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
disable IRQ auto-enable because of requesting.

On the other hand, request_irq() after setting IRQ_NOAUTOEN as
below
irq_set_status_flags(irq, IRQ_NOAUTOEN);
request_irq(dev, irq...);
can also be replaced by request_irq() with IRQF_NO_AUTOEN flag.
Signed-off-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Link: https://lore.kernel.org/r/20210302224916.13980-3-song.bao.hua@hisilicon.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 73cdf82a
...@@ -274,7 +274,7 @@ static int tca6416_keypad_probe(struct i2c_client *client, ...@@ -274,7 +274,7 @@ static int tca6416_keypad_probe(struct i2c_client *client,
error = request_threaded_irq(chip->irqnum, NULL, error = request_threaded_irq(chip->irqnum, NULL,
tca6416_keys_isr, tca6416_keys_isr,
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_FALLING |
IRQF_ONESHOT, IRQF_ONESHOT | IRQF_NO_AUTOEN,
"tca6416-keypad", chip); "tca6416-keypad", chip);
if (error) { if (error) {
dev_dbg(&client->dev, dev_dbg(&client->dev,
...@@ -282,7 +282,6 @@ static int tca6416_keypad_probe(struct i2c_client *client, ...@@ -282,7 +282,6 @@ static int tca6416_keypad_probe(struct i2c_client *client,
chip->irqnum, error); chip->irqnum, error);
goto fail1; goto fail1;
} }
disable_irq(chip->irqnum);
} }
error = input_register_device(input); error = input_register_device(input);
......
...@@ -694,14 +694,13 @@ static int tegra_kbc_probe(struct platform_device *pdev) ...@@ -694,14 +694,13 @@ static int tegra_kbc_probe(struct platform_device *pdev)
input_set_drvdata(kbc->idev, kbc); input_set_drvdata(kbc->idev, kbc);
err = devm_request_irq(&pdev->dev, kbc->irq, tegra_kbc_isr, err = devm_request_irq(&pdev->dev, kbc->irq, tegra_kbc_isr,
IRQF_TRIGGER_HIGH, pdev->name, kbc); IRQF_TRIGGER_HIGH | IRQF_NO_AUTOEN,
pdev->name, kbc);
if (err) { if (err) {
dev_err(&pdev->dev, "failed to request keyboard IRQ\n"); dev_err(&pdev->dev, "failed to request keyboard IRQ\n");
return err; return err;
} }
disable_irq(kbc->irq);
err = input_register_device(kbc->idev); err = input_register_device(kbc->idev);
if (err) { if (err) {
dev_err(&pdev->dev, "failed to register input device\n"); dev_err(&pdev->dev, "failed to register input device\n");
......
...@@ -125,7 +125,7 @@ static int ar1021_i2c_probe(struct i2c_client *client, ...@@ -125,7 +125,7 @@ static int ar1021_i2c_probe(struct i2c_client *client,
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, ar1021_i2c_irq, NULL, ar1021_i2c_irq,
IRQF_ONESHOT, IRQF_ONESHOT | IRQF_NO_AUTOEN,
"ar1021_i2c", ar1021); "ar1021_i2c", ar1021);
if (error) { if (error) {
dev_err(&client->dev, dev_err(&client->dev,
...@@ -133,9 +133,6 @@ static int ar1021_i2c_probe(struct i2c_client *client, ...@@ -133,9 +133,6 @@ static int ar1021_i2c_probe(struct i2c_client *client,
return error; return error;
} }
/* Disable the IRQ, we'll enable it in ar1021_i2c_open() */
disable_irq(client->irq);
error = input_register_device(ar1021->input); error = input_register_device(ar1021->input);
if (error) { if (error) {
dev_err(&client->dev, dev_err(&client->dev,
......
...@@ -3215,15 +3215,14 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -3215,15 +3215,14 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
} }
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, mxt_interrupt, IRQF_ONESHOT, NULL, mxt_interrupt,
IRQF_ONESHOT | IRQF_NO_AUTOEN,
client->name, data); client->name, data);
if (error) { if (error) {
dev_err(&client->dev, "Failed to register interrupt\n"); dev_err(&client->dev, "Failed to register interrupt\n");
return error; return error;
} }
disable_irq(client->irq);
error = regulator_bulk_enable(ARRAY_SIZE(data->regulators), error = regulator_bulk_enable(ARRAY_SIZE(data->regulators),
data->regulators); data->regulators);
if (error) { if (error) {
......
...@@ -401,10 +401,10 @@ static int bu21029_probe(struct i2c_client *client, ...@@ -401,10 +401,10 @@ static int bu21029_probe(struct i2c_client *client,
input_set_drvdata(in_dev, bu21029); input_set_drvdata(in_dev, bu21029);
irq_set_status_flags(client->irq, IRQ_NOAUTOEN);
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, bu21029_touch_soft_irq, NULL, bu21029_touch_soft_irq,
IRQF_ONESHOT, DRIVER_NAME, bu21029); IRQF_ONESHOT | IRQF_NO_AUTOEN,
DRIVER_NAME, bu21029);
if (error) { if (error) {
dev_err(&client->dev, dev_err(&client->dev,
"unable to request touch irq: %d\n", error); "unable to request touch irq: %d\n", error);
......
...@@ -655,7 +655,8 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops, ...@@ -655,7 +655,8 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
} }
error = devm_request_threaded_irq(dev, ts->irq, NULL, cyttsp_irq, error = devm_request_threaded_irq(dev, ts->irq, NULL, cyttsp_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_FALLING | IRQF_ONESHOT |
IRQF_NO_AUTOEN,
"cyttsp", ts); "cyttsp", ts);
if (error) { if (error) {
dev_err(ts->dev, "failed to request IRQ %d, err: %d\n", dev_err(ts->dev, "failed to request IRQ %d, err: %d\n",
...@@ -663,8 +664,6 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops, ...@@ -663,8 +664,6 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
return ERR_PTR(error); return ERR_PTR(error);
} }
disable_irq(ts->irq);
cyttsp_hard_reset(ts); cyttsp_hard_reset(ts);
error = cyttsp_power_on(ts); error = cyttsp_power_on(ts);
......
...@@ -1502,7 +1502,8 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -1502,7 +1502,8 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id)
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, mip4_interrupt, NULL, mip4_interrupt,
IRQF_ONESHOT, MIP4_DEVICE_NAME, ts); IRQF_ONESHOT | IRQF_NO_AUTOEN,
MIP4_DEVICE_NAME, ts);
if (error) { if (error) {
dev_err(&client->dev, dev_err(&client->dev,
"Failed to request interrupt %d: %d\n", "Failed to request interrupt %d: %d\n",
...@@ -1510,8 +1511,6 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -1510,8 +1511,6 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id)
return error; return error;
} }
disable_irq(client->irq);
error = input_register_device(input); error = input_register_device(input);
if (error) { if (error) {
dev_err(&client->dev, dev_err(&client->dev,
......
...@@ -530,13 +530,13 @@ static int mms114_probe(struct i2c_client *client, ...@@ -530,13 +530,13 @@ static int mms114_probe(struct i2c_client *client,
} }
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, mms114_interrupt, IRQF_ONESHOT, NULL, mms114_interrupt,
IRQF_ONESHOT | IRQF_NO_AUTOEN,
dev_name(&client->dev), data); dev_name(&client->dev), data);
if (error) { if (error) {
dev_err(&client->dev, "Failed to register interrupt\n"); dev_err(&client->dev, "Failed to register interrupt\n");
return error; return error;
} }
disable_irq(client->irq);
error = input_register_device(data->input_dev); error = input_register_device(data->input_dev);
if (error) { if (error) {
......
...@@ -691,10 +691,9 @@ static int stmfts_probe(struct i2c_client *client, ...@@ -691,10 +691,9 @@ static int stmfts_probe(struct i2c_client *client,
* interrupts. To be on the safe side it's better to not enable * interrupts. To be on the safe side it's better to not enable
* the interrupts during their request. * the interrupts during their request.
*/ */
irq_set_status_flags(client->irq, IRQ_NOAUTOEN);
err = devm_request_threaded_irq(&client->dev, client->irq, err = devm_request_threaded_irq(&client->dev, client->irq,
NULL, stmfts_irq_handler, NULL, stmfts_irq_handler,
IRQF_ONESHOT, IRQF_ONESHOT | IRQF_NO_AUTOEN,
"stmfts_irq", sdata); "stmfts_irq", sdata);
if (err) if (err)
return err; return err;
......
...@@ -317,14 +317,13 @@ static int wm831x_ts_probe(struct platform_device *pdev) ...@@ -317,14 +317,13 @@ static int wm831x_ts_probe(struct platform_device *pdev)
error = request_threaded_irq(wm831x_ts->data_irq, error = request_threaded_irq(wm831x_ts->data_irq,
NULL, wm831x_ts_data_irq, NULL, wm831x_ts_data_irq,
irqf | IRQF_ONESHOT, irqf | IRQF_ONESHOT | IRQF_NO_AUTOEN,
"Touchscreen data", wm831x_ts); "Touchscreen data", wm831x_ts);
if (error) { if (error) {
dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n",
wm831x_ts->data_irq, error); wm831x_ts->data_irq, error);
goto err_alloc; goto err_alloc;
} }
disable_irq(wm831x_ts->data_irq);
if (pdata && pdata->pd_irqf) if (pdata && pdata->pd_irqf)
irqf = pdata->pd_irqf; irqf = pdata->pd_irqf;
......
...@@ -513,10 +513,10 @@ static int zinitix_ts_probe(struct i2c_client *client) ...@@ -513,10 +513,10 @@ static int zinitix_ts_probe(struct i2c_client *client)
return -EINVAL; return -EINVAL;
} }
irq_set_status_flags(client->irq, IRQ_NOAUTOEN);
error = devm_request_threaded_irq(&client->dev, client->irq, error = devm_request_threaded_irq(&client->dev, client->irq,
NULL, zinitix_ts_irq_handler, NULL, zinitix_ts_irq_handler,
IRQF_ONESHOT, client->name, bt541); IRQF_ONESHOT | IRQF_NO_AUTOEN,
client->name, bt541);
if (error) { if (error) {
dev_err(&client->dev, "Failed to request IRQ: %d\n", error); dev_err(&client->dev, "Failed to request IRQ: %d\n", error);
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment