mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
media: ipu3-cio2: Convert to use software_node_register_node_group()
The currently used software_node_register_nodes() is going to be removed. Prepare driver by switching to a new API. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Tested-by: Daniel Scally <dan.scally@ideasonboard.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com> Link: https://lore.kernel.org/r/20221228094922.84119-3-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1c856b4b11
commit
24e5149217
2 changed files with 21 additions and 5 deletions
|
@ -195,6 +195,19 @@ static void cio2_bridge_init_swnode_names(struct cio2_sensor *sensor)
|
||||||
SWNODE_GRAPH_ENDPOINT_NAME_FMT, 0); /* And endpoint 0 */
|
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,
|
static void cio2_bridge_create_connection_swnodes(struct cio2_bridge *bridge,
|
||||||
struct cio2_sensor *sensor)
|
struct cio2_sensor *sensor)
|
||||||
{
|
{
|
||||||
|
@ -219,6 +232,8 @@ static void cio2_bridge_create_connection_swnodes(struct cio2_bridge *bridge,
|
||||||
if (sensor->ssdb.vcmtype)
|
if (sensor->ssdb.vcmtype)
|
||||||
nodes[SWNODE_VCM] =
|
nodes[SWNODE_VCM] =
|
||||||
NODE_VCM(cio2_vcm_types[sensor->ssdb.vcmtype - 1]);
|
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)
|
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++) {
|
for (i = 0; i < bridge->n_sensors; i++) {
|
||||||
sensor = &bridge->sensors[i];
|
sensor = &bridge->sensors[i];
|
||||||
software_node_unregister_nodes(sensor->swnodes);
|
software_node_unregister_node_group(sensor->group);
|
||||||
ACPI_FREE(sensor->pld);
|
ACPI_FREE(sensor->pld);
|
||||||
acpi_dev_put(sensor->adev);
|
acpi_dev_put(sensor->adev);
|
||||||
i2c_unregister_device(sensor->vcm_i2c_client);
|
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_fwnode_properties(sensor, bridge, cfg);
|
||||||
cio2_bridge_create_connection_swnodes(bridge, sensor);
|
cio2_bridge_create_connection_swnodes(bridge, sensor);
|
||||||
|
|
||||||
ret = software_node_register_nodes(sensor->swnodes);
|
ret = software_node_register_node_group(sensor->group);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_free_pld;
|
goto err_free_pld;
|
||||||
|
|
||||||
|
@ -337,7 +352,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_free_swnodes:
|
err_free_swnodes:
|
||||||
software_node_unregister_nodes(sensor->swnodes);
|
software_node_unregister_node_group(sensor->group);
|
||||||
err_free_pld:
|
err_free_pld:
|
||||||
ACPI_FREE(sensor->pld);
|
ACPI_FREE(sensor->pld);
|
||||||
err_put_adev:
|
err_put_adev:
|
||||||
|
|
|
@ -117,8 +117,9 @@ struct cio2_sensor {
|
||||||
struct acpi_device *adev;
|
struct acpi_device *adev;
|
||||||
struct i2c_client *vcm_i2c_client;
|
struct i2c_client *vcm_i2c_client;
|
||||||
|
|
||||||
/* SWNODE_COUNT + 1 for terminating empty node */
|
/* SWNODE_COUNT + 1 for terminating NULL */
|
||||||
struct software_node swnodes[SWNODE_COUNT + 1];
|
const struct software_node *group[SWNODE_COUNT + 1];
|
||||||
|
struct software_node swnodes[SWNODE_COUNT];
|
||||||
struct cio2_node_names node_names;
|
struct cio2_node_names node_names;
|
||||||
|
|
||||||
struct cio2_sensor_ssdb ssdb;
|
struct cio2_sensor_ssdb ssdb;
|
||||||
|
|
Loading…
Reference in a new issue