soundwire: sysfs: remove sdw_slave_sysfs_init()

Now that sdw_slave_sysfs_init() only calls sdw_slave_sysfs_dpn_init(),
just do that instead and remove sdw_slave_sysfs_init() to get it out of
the way to save a bit of logic and code size.

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>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-By: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/2024013030-denatured-swaddling-b047@gregkh
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c
index b913322a2070dd584c5f334e34046434a9ee1361..c32faace618f8959cad6762de86296bf724902bc 100644 (file)
--- a/drivers/soundwire/bus_type.c
+++ b/drivers/soundwire/bus_type.c
@@ -126,8 +126,8 @@ static int sdw_drv_probe(struct device *dev)
        if (slave->prop.use_domain_irq)
                sdw_irq_create_mapping(slave);
 
-       /* init the sysfs as we have properties now */
-       ret = sdw_slave_sysfs_init(slave);
+       /* init the dynamic sysfs attributes we need */
+       ret = sdw_slave_sysfs_dpn_init(slave);
        if (ret < 0)
                dev_warn(dev, "Slave sysfs init failed:%d\n", ret);
 

diff --git a/drivers/soundwire/sysfs_local.h b/drivers/soundwire/sysfs_local.h
index 3ab8658a77823fd79feafe2e47cddc504172345c..fa048e112629a27009a478e267246dd16a3f3c62 100644 (file)
--- a/drivers/soundwire/sysfs_local.h
+++ b/drivers/soundwire/sysfs_local.h
@@ -15,7 +15,6 @@ extern const struct attribute_group *sdw_slave_status_attr_groups[];
 extern const struct attribute_group *sdw_attr_groups[];
 
 /* additional device-managed properties reported after driver probe */
-int sdw_slave_sysfs_init(struct sdw_slave *slave);
 int sdw_slave_sysfs_dpn_init(struct sdw_slave *slave);
 
 #endif /* __SDW_SYSFS_LOCAL_H */

diff --git a/drivers/soundwire/sysfs_slave.c b/drivers/soundwire/sysfs_slave.c
index 3afc0dc06c982c2f66de3395ba7458584f4b564c..0eefc205f6970c80cb72b357a0a0734fce3749ee 100644 (file)
--- a/drivers/soundwire/sysfs_slave.c
+++ b/drivers/soundwire/sysfs_slave.c
@@ -221,19 +221,6 @@ const struct attribute_group *sdw_attr_groups[] = {
        NULL,
 };
 
-int sdw_slave_sysfs_init(struct sdw_slave *slave)
-{
-       int ret;
-
-       if (slave->prop.source_ports || slave->prop.sink_ports) {
-               ret = sdw_slave_sysfs_dpn_init(slave);
-               if (ret < 0)
-                       return ret;
-       }
-
-       return 0;
-}
-
 /*
  * the status is shown in capital letters for UNATTACHED and RESERVED
  * on purpose, to highligh users to the fact that these status values

diff --git a/drivers/soundwire/sysfs_slave_dpn.c b/drivers/soundwire/sysfs_slave_dpn.c
index c4b6543c09fd671810708865e49ac39fa51c1327..a3fb380ee51941b21780212808d2be64c9d7ce8d 100644 (file)
--- a/drivers/soundwire/sysfs_slave_dpn.c
+++ b/drivers/soundwire/sysfs_slave_dpn.c
@@ -283,6 +283,9 @@ int sdw_slave_sysfs_dpn_init(struct sdw_slave *slave)
        int ret;
        int i;
 
+       if (!slave->prop.source_ports && !slave->prop.sink_ports)
+               return 0;
+
        mask = slave->prop.source_ports;
        for_each_set_bit(i, &mask, 32) {
                ret = add_all_attributes(&slave->dev, i, 1);