soundwire: remove DAI_ID_RANGE definitions

There is no reason to reserve a range of DAI IDs for SoundWire. This
is not scalable and it's better to let the ASoC core allocate the
dai->id when registering a component.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190916192348.467-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index bcc5077b28147857f1413419ef1194699970b820..9d578dafa29283ba85e0506a7009b788b39e42de 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -873,8 +873,6 @@ static int intel_create_dai(struct sdw_cdns *cdns,
                        dais[i].capture.formats = SNDRV_PCM_FMTBIT_S16_LE;
                }
 
-               dais[i].id = SDW_DAI_ID_RANGE_START + i;
-
                if (pcm)
                        dais[i].ops = &intel_pcm_dai_ops;
                else

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index ea787201c3ac4f049a2ea76f0dcdc42a118a21e5..688b40e65c8988f5707fc5c109aa9628076d813f 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -40,9 +40,6 @@ struct sdw_slave;
 
 #define SDW_VALID_PORT_RANGE(n)                ((n) <= 14 && (n) >= 1)
 
-#define SDW_DAI_ID_RANGE_START         100
-#define SDW_DAI_ID_RANGE_END           200
-
 enum {
        SDW_PORT_DIRN_SINK = 0,
        SDW_PORT_DIRN_SOURCE,