Commit 5315052d authored by Javier Carrasco's avatar Javier Carrasco Committed by Greg Kroah-Hartman
Browse files

usb: typec: tipd: drop second firmware name read 



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: default avatarJavier Carrasco <javier.carrasco@wolfvision.net>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240606-tps6598x_fw_update_log-v1-1-2b5b8369a0ba@wolfvision.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38935f33

drivers/usb/typec/tipd/core.c

+7 −17
Original line number Diff line number Diff line
@@ -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;