linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Input: goodix - switch to using cleanup functions in firmware code

Browse Source 
Start using __free(firmware) to simplify the code and error handling.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov
2026-03-24 21:14:27 -07:00
parent 576c99f1a3
commit 777f5b42f8
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/touchscreen/goodix_fwupload.c
+15 -14
View File
@@ -188,13 +188,13 @@ static int goodix_start_firmware(struct i2c_client *client)
static int goodix_firmware_upload(struct goodix_ts_data *ts)
{
const struct firmware *fw;
char fw_name[64];
const u8 *data;
int error;
snprintf(fw_name, sizeof(fw_name), "goodix/%s", ts->firmware_name);
const struct firmware *fw __free(firmware) = NULL;
error = request_firmware(&fw, fw_name, &ts->client->dev);
if (error) {
dev_err(&ts->client->dev, "Firmware request error %d\n", error);
@@ -203,60 +203,61 @@ static int goodix_firmware_upload(struct goodix_ts_data *ts)
error = goodix_firmware_verify(&ts->client->dev, fw);
if (error)
goto release;
return error;
error = goodix_reset_no_int_sync(ts);
if (error)
goto release;
return error;
error = goodix_enter_upload_mode(ts->client);
if (error)
goto release;
return error;
/* Select SRAM bank 0 and upload section 1 & 2 */
error = goodix_i2c_write_u8(ts->client,
GOODIX_REG_MISCTL_SRAM_BANK, 0x00);
if (error)
goto release;
return error;
data = fw->data + GOODIX_FW_HEADER_LENGTH;
error = goodix_i2c_write(ts->client, GOODIX_FW_UPLOAD_ADDRESS,
data, 2 * GOODIX_FW_SECTION_LENGTH);
if (error)
goto release;
return error;
/* Select SRAM bank 1 and upload section 3 & 4 */
error = goodix_i2c_write_u8(ts->client,
GOODIX_REG_MISCTL_SRAM_BANK, 0x01);
if (error)
goto release;
return error;
data += 2 * GOODIX_FW_SECTION_LENGTH;
error = goodix_i2c_write(ts->client, GOODIX_FW_UPLOAD_ADDRESS,
data, 2 * GOODIX_FW_SECTION_LENGTH);
if (error)
goto release;
return error;
/* Select SRAM bank 2 and upload the DSP firmware */
error = goodix_i2c_write_u8(ts->client,
GOODIX_REG_MISCTL_SRAM_BANK, 0x02);
if (error)
goto release;
return error;
data += 2 * GOODIX_FW_SECTION_LENGTH;
error = goodix_i2c_write(ts->client, GOODIX_FW_UPLOAD_ADDRESS,
data, GOODIX_FW_DSP_LENGTH);
if (error)
goto release;
return error;
error = goodix_start_firmware(ts->client);
if (error)
goto release;
return error;
error = goodix_int_sync(ts);
release:
release_firmware(fw);
return error;
if (error)
return error;
return 0;
}
static int goodix_prepare_bak_ref(struct goodix_ts_data *ts)