On Thu, Jun 06, 2024 at 11:03:55AM +0200, Javier Carrasco wrote:
> tps_request_firmware() reads the firmware name and there is no need to
> repeat the action in the device-specific implementations of the firmware
> update mechanism.
>
> Provide the firmware name as a parameter in tps_request_firmware() to
> avoid repetitive operations in the device-specific implementations.
>
> Signed-off-by: Javier Carrasco <javier.carrasco@xxxxxxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/usb/typec/tipd/core.c | 24 +++++++-----------------
> 1 file changed, 7 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index ad76dbd20e65..851b0d02727a 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -892,19 +892,19 @@ tps6598x_register_port(struct tps6598x *tps, struct fwnode_handle *fwnode)
> return 0;
> }
>
> -static int tps_request_firmware(struct tps6598x *tps, const struct firmware **fw)
> +static int tps_request_firmware(struct tps6598x *tps, const struct firmware **fw,
> + const char **firmware_name)
> {
> - const char *firmware_name;
> int ret;
>
> ret = device_property_read_string(tps->dev, "firmware-name",
> - &firmware_name);
> + firmware_name);
> if (ret)
> return ret;
>
> - ret = request_firmware(fw, firmware_name, tps->dev);
> + ret = request_firmware(fw, *firmware_name, tps->dev);
> if (ret) {
> - dev_err(tps->dev, "failed to retrieve \"%s\"\n", firmware_name);
> + dev_err(tps->dev, "failed to retrieve \"%s\"\n", *firmware_name);
> return ret;
> }
>
> @@ -999,12 +999,7 @@ static int tps25750_start_patch_burst_mode(struct tps6598x *tps)
> u32 addr;
> struct device_node *np = tps->dev->of_node;
>
> - ret = device_property_read_string(tps->dev, "firmware-name",
> - &firmware_name);
> - if (ret)
> - return ret;
> -
> - ret = tps_request_firmware(tps, &fw);
> + ret = tps_request_firmware(tps, &fw, &firmware_name);
> if (ret)
> return ret;
>
> @@ -1155,12 +1150,7 @@ static int tps6598x_apply_patch(struct tps6598x *tps)
> const char *firmware_name;
> int ret;
>
> - ret = device_property_read_string(tps->dev, "firmware-name",
> - &firmware_name);
> - if (ret)
> - return ret;
> -
> - ret = tps_request_firmware(tps, &fw);
> + ret = tps_request_firmware(tps, &fw, &firmware_name);
> if (ret)
> return ret;
>
>
> --
> 2.40.1
--
heikki
