Commit 7c459517 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ac7e0839

drivers/input/touchscreen/ili210x.c

+7 −9
Original line number Diff line number Diff line
@@ -860,8 +860,7 @@ 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);



		ili210x_hardware_reset(priv->reset_gpio);
@@ -871,8 +870,7 @@ static ssize_t ili210x_firmware_update_store(struct device *dev, 
		ili210x_hardware_reset(priv->reset_gpio);



		dev_dbg(dev, "Firmware update ended, error=%i\n", error);



	enable_irq(client->irq);

	}



	return error ?: count;

}