| Message ID | 20220729135041.2285908-1-gregkh@linuxfoundation.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/5] soundwire: sysfs: move sdw_slave_dev_attr_group into the existing list of groups | expand |
On 29-07-22, 15:50, Greg Kroah-Hartman wrote: > The sysfs logic already creates a list of groups for the device, so add > the sdw_slave_dev_attr_group group to that list instead of having to do > a two-step process of adding a group list and then an individual group. > > This is a step on the way to moving all of the sysfs attribute handling > into the default driver core attribute group logic so that the soundwire > core does not have to do any of it manually. Hey Greg, DO you have a v2 for this, or if you are too busy I can update the patchset...
On Tue, Aug 23, 2022 at 09:30:02PM +0530, Vinod Koul wrote: > On 29-07-22, 15:50, Greg Kroah-Hartman wrote: > > The sysfs logic already creates a list of groups for the device, so add > > the sdw_slave_dev_attr_group group to that list instead of having to do > > a two-step process of adding a group list and then an individual group. > > > > This is a step on the way to moving all of the sysfs attribute handling > > into the default driver core attribute group logic so that the soundwire > > core does not have to do any of it manually. > > Hey Greg, > > DO you have a v2 for this, or if you are too busy I can update the > patchset... Oh wait, I did rebase it, I'll send it out this afternoon, thanks for the reminder... greg k-h
On Tue, Aug 23, 2022 at 09:30:02PM +0530, Vinod Koul wrote: > On 29-07-22, 15:50, Greg Kroah-Hartman wrote: > > The sysfs logic already creates a list of groups for the device, so add > > the sdw_slave_dev_attr_group group to that list instead of having to do > > a two-step process of adding a group list and then an individual group. > > > > This is a step on the way to moving all of the sysfs attribute handling > > into the default driver core attribute group logic so that the soundwire > > core does not have to do any of it manually. > > Hey Greg, > > DO you have a v2 for this, or if you are too busy I can update the > patchset... v2 is now here: https://lore.kernel.org/r/20220824135951.3604059-1-gregkh@linuxfoundation.org
diff --git a/drivers/soundwire/sysfs_slave.c b/drivers/soundwire/sysfs_slave.c index 3210359cd944..83e3f6cc3250 100644 --- a/drivers/soundwire/sysfs_slave.c +++ b/drivers/soundwire/sysfs_slave.c @@ -105,7 +105,10 @@ static struct attribute *slave_attrs[] = { &dev_attr_modalias.attr, NULL, }; -ATTRIBUTE_GROUPS(slave); + +static const struct attribute_group slave_attr_group = { + .attrs = slave_attrs, +}; static struct attribute *slave_dev_attrs[] = { &dev_attr_mipi_revision.attr, @@ -190,6 +193,12 @@ static const struct attribute_group dp0_group = { .name = "dp0", }; +static const struct attribute_group *slave_groups[] = { + &slave_attr_group, + &sdw_slave_dev_attr_group, + NULL, +}; + int sdw_slave_sysfs_init(struct sdw_slave *slave) { int ret; @@ -198,10 +207,6 @@ int sdw_slave_sysfs_init(struct sdw_slave *slave) if (ret < 0) return ret; - ret = devm_device_add_group(&slave->dev, &sdw_slave_dev_attr_group); - if (ret < 0) - return ret; - if (slave->prop.dp0_prop) { ret = devm_device_add_group(&slave->dev, &dp0_group); if (ret < 0)
The sysfs logic already creates a list of groups for the device, so add the sdw_slave_dev_attr_group group to that list instead of having to do a two-step process of adding a group list and then an individual group. This is a step on the way to moving all of the sysfs attribute handling into the default driver core attribute group logic so that the soundwire core does not have to do any of it manually. Cc: Vinod Koul <vkoul@kernel.org> Cc: Bard Liao <yung-chuan.liao@linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Sanyog Kale <sanyog.r.kale@intel.com> Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/soundwire/sysfs_slave.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)