| Message ID | Zxwd9c0njasZZoal@google.com |
|---|---|
| State | Accepted |
| Commit | cbdc3f95cdf817e6adc5c783464658d30e9ccb61 |
| Headers | show |
| Series | Input: synaptics-rmi4 - switch to using cleanup functions in F34 | expand |
Reviewed-by: Lyude Paul <lyude@redhat.com> On Fri, 2024-10-25 at 15:38 -0700, Dmitry Torokhov wrote: > Start using __free() and guard() primitives to simplify the code > and error handling. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/input/rmi4/rmi_f34.c | 37 ++++++++++++++---------------------- > 1 file changed, 14 insertions(+), 23 deletions(-) > > diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c > index 3b3ac71e53dc..7a05ac00dce2 100644 > --- a/drivers/input/rmi4/rmi_f34.c > +++ b/drivers/input/rmi4/rmi_f34.c > @@ -246,7 +246,6 @@ static int rmi_f34_update_firmware(struct f34_data *f34, > (const struct rmi_f34_firmware *)fw->data; > u32 image_size = le32_to_cpu(syn_fw->image_size); > u32 config_size = le32_to_cpu(syn_fw->config_size); > - int ret; > > BUILD_BUG_ON(offsetof(struct rmi_f34_firmware, data) != > F34_FW_IMAGE_OFFSET); > @@ -267,8 +266,7 @@ static int rmi_f34_update_firmware(struct f34_data *f34, > dev_err(&f34->fn->dev, > "Bad firmware image: fw size %d, expected %d\n", > image_size, f34->v5.fw_blocks * f34->v5.block_size); > - ret = -EILSEQ; > - goto out; > + return -EILSEQ; > } > > if (config_size && > @@ -277,25 +275,18 @@ static int rmi_f34_update_firmware(struct f34_data *f34, > "Bad firmware image: config size %d, expected %d\n", > config_size, > f34->v5.config_blocks * f34->v5.block_size); > - ret = -EILSEQ; > - goto out; > + return -EILSEQ; > } > > if (image_size && !config_size) { > dev_err(&f34->fn->dev, "Bad firmware image: no config data\n"); > - ret = -EILSEQ; > - goto out; > + return -EILSEQ; > } > > dev_info(&f34->fn->dev, "Firmware image OK\n"); > - mutex_lock(&f34->v5.flash_mutex); > - > - ret = rmi_f34_flash_firmware(f34, syn_fw); > > - mutex_unlock(&f34->v5.flash_mutex); > - > -out: > - return ret; > + guard(mutex)(&f34->v5.flash_mutex); > + return rmi_f34_flash_firmware(f34, syn_fw); > } > > static int rmi_f34_status(struct rmi_function *fn) > @@ -461,9 +452,8 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev, > { > struct rmi_driver_data *data = dev_get_drvdata(dev); > char fw_name[NAME_MAX]; > - const struct firmware *fw; > size_t copy_count = count; > - int ret; > + int error; > > if (count == 0 || count >= NAME_MAX) > return -EINVAL; > @@ -474,17 +464,18 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev, > memcpy(fw_name, buf, copy_count); > fw_name[copy_count] = '\0'; > > - ret = request_firmware(&fw, fw_name, dev); > - if (ret) > - return ret; > + const struct firmware *fw __free(firmware) = NULL; > + error = request_firmware(&fw, fw_name, dev); > + if (error) > + return error; > > dev_info(dev, "Flashing %s\n", fw_name); > > - ret = rmi_firmware_update(data, fw); > - > - release_firmware(fw); > + error = rmi_firmware_update(data, fw); > + if (error) > + return error; > > - return ret ?: count; > + return count; > } > > static DEVICE_ATTR(update_fw, 0200, NULL, rmi_driver_update_fw_store); > -- > 2.47.0.163.g1226f6d8fa-goog > >
diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c index 3b3ac71e53dc..7a05ac00dce2 100644 --- a/drivers/input/rmi4/rmi_f34.c +++ b/drivers/input/rmi4/rmi_f34.c @@ -246,7 +246,6 @@ static int rmi_f34_update_firmware(struct f34_data *f34, (const struct rmi_f34_firmware *)fw->data; u32 image_size = le32_to_cpu(syn_fw->image_size); u32 config_size = le32_to_cpu(syn_fw->config_size); - int ret; BUILD_BUG_ON(offsetof(struct rmi_f34_firmware, data) != F34_FW_IMAGE_OFFSET); @@ -267,8 +266,7 @@ static int rmi_f34_update_firmware(struct f34_data *f34, dev_err(&f34->fn->dev, "Bad firmware image: fw size %d, expected %d\n", image_size, f34->v5.fw_blocks * f34->v5.block_size); - ret = -EILSEQ; - goto out; + return -EILSEQ; } if (config_size && @@ -277,25 +275,18 @@ static int rmi_f34_update_firmware(struct f34_data *f34, "Bad firmware image: config size %d, expected %d\n", config_size, f34->v5.config_blocks * f34->v5.block_size); - ret = -EILSEQ; - goto out; + return -EILSEQ; } if (image_size && !config_size) { dev_err(&f34->fn->dev, "Bad firmware image: no config data\n"); - ret = -EILSEQ; - goto out; + return -EILSEQ; } dev_info(&f34->fn->dev, "Firmware image OK\n"); - mutex_lock(&f34->v5.flash_mutex); - - ret = rmi_f34_flash_firmware(f34, syn_fw); - mutex_unlock(&f34->v5.flash_mutex); - -out: - return ret; + guard(mutex)(&f34->v5.flash_mutex); + return rmi_f34_flash_firmware(f34, syn_fw); } static int rmi_f34_status(struct rmi_function *fn) @@ -461,9 +452,8 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev, { struct rmi_driver_data *data = dev_get_drvdata(dev); char fw_name[NAME_MAX]; - const struct firmware *fw; size_t copy_count = count; - int ret; + int error; if (count == 0 || count >= NAME_MAX) return -EINVAL; @@ -474,17 +464,18 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev, memcpy(fw_name, buf, copy_count); fw_name[copy_count] = '\0'; - ret = request_firmware(&fw, fw_name, dev); - if (ret) - return ret; + const struct firmware *fw __free(firmware) = NULL; + error = request_firmware(&fw, fw_name, dev); + if (error) + return error; dev_info(dev, "Flashing %s\n", fw_name); - ret = rmi_firmware_update(data, fw); - - release_firmware(fw); + error = rmi_firmware_update(data, fw); + if (error) + return error; - return ret ?: count; + return count; } static DEVICE_ATTR(update_fw, 0200, NULL, rmi_driver_update_fw_store);
Start using __free() and guard() primitives to simplify the code and error handling. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/rmi4/rmi_f34.c | 37 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 23 deletions(-)