mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

Input: synaptics-rmi4 - drop useless gotos in rmi_f34v7_do_reflash()

Browse source 
Returning directly makes the code clearer.

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-10-matthias.schiffer@ew.tq-group.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Matthias Schiffer 2022-06-08 14:48:08 +02:00 committed by Dmitry Torokhov
parent 7d128a8d41
commit 87d3d1b140
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/input/rmi4/rmi_f34v7.c
View file

@ -1039,19 +1039,19 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
ret = rmi_f34v7_parse_image_info(f34);
if (ret < 0)
goto fail;
return ret;
ret = rmi_f34v7_check_bl_config_size(f34);
if (ret < 0)
goto fail;
return ret;
ret = rmi_f34v7_erase_all(f34);
if (ret < 0)
goto fail;
return ret;
ret = rmi_f34v7_write_partition_table(f34);
if (ret < 0)
goto fail;
return ret;
dev_info(&f34->fn->dev, "%s: Partition table programmed\n", __func__);
/*
@ -1067,7 +1067,7 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
ret = rmi_f34v7_write_firmware(f34);
if (ret < 0)
goto fail;
return ret;
dev_info(&f34->fn->dev, "Writing config (%d bytes)...\n",
f34->v7.img.ui_config.size);
@ -1075,14 +1075,14 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
f34->v7.config_area = v7_UI_CONFIG_AREA;
ret = rmi_f34v7_write_ui_config(f34);
if (ret < 0)
goto fail;
return ret;
if (f34->v7.has_display_cfg && f34->v7.img.contains_display_cfg) {
dev_info(&f34->fn->dev, "Writing display config...\n");
ret = rmi_f34v7_write_dp_config(f34);
if (ret < 0)
goto fail;
return ret;
}
if (f34->v7.has_guest_code && f34->v7.img.contains_guest_code) {
@ -1090,11 +1090,10 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
ret = rmi_f34v7_write_guest_code(f34);
if (ret < 0)
goto fail;
return ret;
}
fail:
return ret;
return 0;
}
static int rmi_f34v7_enter_flash_prog(struct f34_data *f34)