Input: synaptics-rmi4 - simplify rmi_f34v7_start_reflash()

rmi_f34v7_enter_flash_prog() already enables IRQs and checks the flash
status - there's no need for rmi_f34v7_start_reflash() to do the same just
before calling rmi_f34v7_enter_flash_prog().

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://lore.kernel.org/r/20220608124808.51402-9-matthias.schiffer@ew.tq-group.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c
index 5c22ad4bcc7461f627524345f8caad41c6a805c4..f16c67eb6cc62ab90d89cab3fb1ac7888f8c27b3 100644 (file)
--- a/drivers/input/rmi4/rmi_f34v7.c
+++ b/drivers/input/rmi4/rmi_f34v7.c
@@ -1107,8 +1107,11 @@ static int rmi_f34v7_enter_flash_prog(struct f34_data *f34)
        if (ret < 0)
                return ret;
 
-       if (f34->v7.in_bl_mode)
+       if (f34->v7.in_bl_mode) {
+               dev_info(&f34->fn->dev, "%s: Device in bootloader mode\n",
+                        __func__);
                return 0;
+       }
 
        init_completion(&f34->v7.cmd_done);
 
@@ -1127,32 +1130,16 @@ int rmi_f34v7_start_reflash(struct f34_data *f34, const struct firmware *fw)
 {
        int ret = 0;
 
-       f34->fn->rmi_dev->driver->set_irq_bits(f34->fn->rmi_dev, f34->fn->irq_mask);
-
        f34->v7.config_area = v7_UI_CONFIG_AREA;
        f34->v7.image = fw->data;
 
        ret = rmi_f34v7_parse_image_info(f34);
        if (ret < 0)
-               goto exit;
+               return ret;
 
        dev_info(&f34->fn->dev, "Firmware image OK\n");
 
-       ret = rmi_f34v7_read_flash_status(f34);
-       if (ret < 0)
-               goto exit;
-
-       if (f34->v7.in_bl_mode) {
-               dev_info(&f34->fn->dev, "%s: Device in bootloader mode\n",
-                               __func__);
-       }
-
-       rmi_f34v7_enter_flash_prog(f34);
-
-       return 0;
-
-exit:
-       return ret;
+       return rmi_f34v7_enter_flash_prog(f34);
 }
 
 int rmi_f34v7_probe(struct f34_data *f34)