soundwire: disco: s/ch/channels/

Use more meaningful member names in preparation for sysfs support.
No functionality change.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20200518203551.2053-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c
index 844e6b2..4ae62b4 100644 (file)
--- a/drivers/soundwire/mipi_disco.c
+++ b/drivers/soundwire/mipi_disco.c
@@ -231,16 +231,17 @@ static int sdw_slave_read_dpn(struct sdw_slave *slave,
 
                nval = fwnode_property_count_u32(node, "mipi-sdw-channel-number-list");
                if (nval > 0) {
-                       dpn[i].num_ch = nval;
-                       dpn[i].ch = devm_kcalloc(&slave->dev, dpn[i].num_ch,
-                                                sizeof(*dpn[i].ch),
+                       dpn[i].num_channels = nval;
+                       dpn[i].channels = devm_kcalloc(&slave->dev,
+                                                      dpn[i].num_channels,
+                                                      sizeof(*dpn[i].channels),
                                                 GFP_KERNEL);
-                       if (!dpn[i].ch)
+                       if (!dpn[i].channels)
                                return -ENOMEM;
 
                        fwnode_property_read_u32_array(node,
                                        "mipi-sdw-channel-number-list",
-                                       dpn[i].ch, dpn[i].num_ch);
+                                       dpn[i].channels, dpn[i].num_channels);
                }
 
                nval = fwnode_property_count_u32(node, "mipi-sdw-channel-combination-list");

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 7658d96..9c27a32 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -291,8 +291,8 @@ struct sdw_dpn_audio_mode {
  * implementation-defined interrupts
  * @max_ch: Maximum channels supported
  * @min_ch: Minimum channels supported
- * @num_ch: Number of discrete channels supported
- * @ch: Discrete channels supported
+ * @num_channels: Number of discrete channels supported
+ * @channels: Discrete channels supported
  * @num_ch_combinations: Number of channel combinations supported
  * @ch_combinations: Channel combinations supported
  * @modes: SDW mode supported
@@ -316,8 +316,8 @@ struct sdw_dpn_prop {
        u32 imp_def_interrupts;
        u32 max_ch;
        u32 min_ch;
-       u32 num_ch;
-       u32 *ch;
+       u32 num_channels;
+       u32 *channels;
        u32 num_ch_combinations;
        u32 *ch_combinations;
        u32 modes;