Re: [PATCH v1 2/4] media: ipu3-cio2: Convert to use software_node_register_node_group()

[Dan Scally]

Hi Andy

On 18/11/2022 18:56, Andy Shevchenko wrote:
> The currently used software_node_register_nodes() is going to
> be removed. Prepare driver by switchich to new API.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> ---


Also looks good to me:

Reviewed-by: Daniel Scally <dan.scally@xxxxxxxxxxxxxxxx>

>   drivers/media/pci/intel/ipu3/cio2-bridge.c | 21 ++++++++++++++++++---
>   drivers/media/pci/intel/ipu3/cio2-bridge.h |  5 +++--
>   2 files changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.c b/drivers/media/pci/intel/ipu3/cio2-bridge.c
> index 18974a72e94a..dfefe0d8aa95 100644
> --- a/drivers/media/pci/intel/ipu3/cio2-bridge.c
> +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.c
> @@ -195,6 +195,19 @@ static void cio2_bridge_init_swnode_names(struct cio2_sensor *sensor)
>   		 SWNODE_GRAPH_ENDPOINT_NAME_FMT, 0); /* And endpoint 0 */
>   }
>   
> +static void cio2_bridge_init_swnode_group(struct cio2_sensor *sensor)
> +{
> +	struct software_node *nodes = sensor->swnodes;
> +
> +	sensor->group[SWNODE_SENSOR_HID] = &nodes[SWNODE_SENSOR_HID];
> +	sensor->group[SWNODE_SENSOR_PORT] = &nodes[SWNODE_SENSOR_PORT];
> +	sensor->group[SWNODE_SENSOR_ENDPOINT] = &nodes[SWNODE_SENSOR_ENDPOINT];
> +	sensor->group[SWNODE_CIO2_PORT] = &nodes[SWNODE_CIO2_PORT];
> +	sensor->group[SWNODE_CIO2_ENDPOINT] = &nodes[SWNODE_CIO2_ENDPOINT];
> +	if (sensor->ssdb.vcmtype)
> +		sensor->group[SWNODE_VCM] =  &nodes[SWNODE_VCM];
> +}
> +
>   static void cio2_bridge_create_connection_swnodes(struct cio2_bridge *bridge,
>   						  struct cio2_sensor *sensor)
>   {
> @@ -219,6 +232,8 @@ static void cio2_bridge_create_connection_swnodes(struct cio2_bridge *bridge,
>   	if (sensor->ssdb.vcmtype)
>   		nodes[SWNODE_VCM] =
>   			NODE_VCM(cio2_vcm_types[sensor->ssdb.vcmtype - 1]);
> +
> +	cio2_bridge_init_swnode_group(sensor);
>   }
>   
>   static void cio2_bridge_instantiate_vcm_i2c_client(struct cio2_sensor *sensor)
> @@ -252,7 +267,7 @@ static void cio2_bridge_unregister_sensors(struct cio2_bridge *bridge)
>   
>   	for (i = 0; i < bridge->n_sensors; i++) {
>   		sensor = &bridge->sensors[i];
> -		software_node_unregister_nodes(sensor->swnodes);
> +		software_node_unregister_node_group(sensor->group);
>   		ACPI_FREE(sensor->pld);
>   		acpi_dev_put(sensor->adev);
>   		i2c_unregister_device(sensor->vcm_i2c_client);
> @@ -310,7 +325,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
>   		cio2_bridge_create_fwnode_properties(sensor, bridge, cfg);
>   		cio2_bridge_create_connection_swnodes(bridge, sensor);
>   
> -		ret = software_node_register_nodes(sensor->swnodes);
> +		ret = software_node_register_node_group(sensor->group);
>   		if (ret)
>   			goto err_free_pld;
>   
> @@ -337,7 +352,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
>   	return 0;
>   
>   err_free_swnodes:
> -	software_node_unregister_nodes(sensor->swnodes);
> +	software_node_unregister_node_group(sensor->group);
>   err_free_pld:
>   	ACPI_FREE(sensor->pld);
>   err_put_adev:
> diff --git a/drivers/media/pci/intel/ipu3/cio2-bridge.h b/drivers/media/pci/intel/ipu3/cio2-bridge.h
> index 4418cbd08208..b93b749c65bd 100644
> --- a/drivers/media/pci/intel/ipu3/cio2-bridge.h
> +++ b/drivers/media/pci/intel/ipu3/cio2-bridge.h
> @@ -117,8 +117,9 @@ struct cio2_sensor {
>   	struct acpi_device *adev;
>   	struct i2c_client *vcm_i2c_client;
>   
> -	/* SWNODE_COUNT + 1 for terminating empty node */
> -	struct software_node swnodes[SWNODE_COUNT + 1];
> +	/* SWNODE_COUNT + 1 for terminating NULL */
> +	const struct software_node *group[SWNODE_COUNT + 1];
> +	struct software_node swnodes[SWNODE_COUNT];
>   	struct cio2_node_names node_names;
>   
>   	struct cio2_sensor_ssdb ssdb;