From: Hans de Goede <hdegoede@redhat.com>
To: "Dan Scally" <dan.scally@ideasonboard.com>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Clément Léger" <clement.leger@bootlin.com>,
"Sakari Ailus" <sakari.ailus@linux.intel.com>,
"Mauro Carvalho Chehab" <mchehab@kernel.org>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Cc: Daniel Scally <djrscally@gmail.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Yong Zhi <yong.zhi@intel.com>, Bingbu Cao <bingbu.cao@intel.com>,
Tianshu Qiu <tian.shu.qiu@intel.com>
Subject: Re: [PATCH v1 2/4] media: ipu3-cio2: Convert to use software_node_register_node_group()
Date: Mon, 21 Nov 2022 11:22:17 +0100 [thread overview]
Message-ID: <93eb74bf-58c4-1a77-af2f-3a0df4404acf@redhat.com> (raw)
In-Reply-To: <2c69ae41-7920-1438-8bfc-8581aad0ee00@ideasonboard.com>
Hi Dan,
On 11/21/22 11:19, Dan Scally wrote:
> 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@linux.intel.com>
>> ---
>
>
> Also looks good to me:
>
> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Any chance you can also give this series a test run on an IPU3 device to
ensure that it does not cause regressions ?
Regards,
Hans
>
>> 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;
>
next prev parent reply other threads:[~2022-11-21 10:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 18:56 [PATCH v1 1/4] media: ipu3-cio2: Don't dereference fwnode handle Andy Shevchenko
2022-11-18 18:56 ` [PATCH v1 2/4] media: ipu3-cio2: Convert to use software_node_register_node_group() Andy Shevchenko
2022-11-21 10:19 ` Dan Scally
2022-11-21 10:22 ` Hans de Goede [this message]
2022-11-21 10:23 ` Daniel Scally
2022-11-21 10:27 ` Andy Shevchenko
2022-11-21 14:32 ` Dan Scally
2022-11-21 14:40 ` Hans de Goede
2022-11-18 18:56 ` [PATCH v1 3/4] software node: Switch property entry test to new API Andy Shevchenko
2022-11-23 19:01 ` Greg Kroah-Hartman
2022-11-23 19:07 ` Andy Shevchenko
2022-11-23 19:25 ` Greg Kroah-Hartman
2022-11-18 18:56 ` [PATCH v1 4/4] software node: Remove unused APIs Andy Shevchenko
2022-11-23 19:02 ` Greg Kroah-Hartman
2022-11-21 9:02 ` [PATCH v1 1/4] media: ipu3-cio2: Don't dereference fwnode handle Heikki Krogerus
2022-11-21 10:01 ` Dan Scally
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=93eb74bf-58c4-1a77-af2f-3a0df4404acf@redhat.com \
--to=hdegoede@redhat.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bingbu.cao@intel.com \
--cc=clement.leger@bootlin.com \
--cc=dan.scally@ideasonboard.com \
--cc=djrscally@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rafael@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tian.shu.qiu@intel.com \
--cc=yong.zhi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).