Input: ili210x - use guard notation when disabling and reenabling IRQ

This makes the code more compact and error handling more robust.

Link: https://lore.kernel.org/r/20240609234757.610273-3-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2024-06-09 16:47:55 -07:00
parent ac7e0839da
commit 7c45951725

View File

@ -860,19 +860,17 @@ static ssize_t ili210x_firmware_update_store(struct device *dev,
* the touch controller to disable the IRQs during update, so we have
* to do it this way here.
*/
disable_irq(client->irq);
scoped_guard(disable_irq, &client->irq) {
dev_dbg(dev, "Firmware update started, firmware=%s\n", fwname);
dev_dbg(dev, "Firmware update started, firmware=%s\n", fwname);
ili210x_hardware_reset(priv->reset_gpio);
ili210x_hardware_reset(priv->reset_gpio);
error = ili210x_do_firmware_update(priv, fwbuf, ac_end, df_end);
error = ili210x_do_firmware_update(priv, fwbuf, ac_end, df_end);
ili210x_hardware_reset(priv->reset_gpio);
ili210x_hardware_reset(priv->reset_gpio);
dev_dbg(dev, "Firmware update ended, error=%i\n", error);
enable_irq(client->irq);
dev_dbg(dev, "Firmware update ended, error=%i\n", error);
}
return error ?: count;
}