diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c index c25e317c891d3c..5d45adb2849121 100644 --- a/drivers/soundwire/slave.c +++ b/drivers/soundwire/slave.c @@ -109,7 +109,7 @@ int sdw_slave_wait_for_initialization(struct sdw_slave *slave, unsigned int time unsigned long time; time = wait_for_completion_timeout(&slave->initialization_complete, - msecs_to_jiffies(timeout)); + msecs_to_jiffies(timeout)); if (!time) { dev_err(&slave->dev, "%s: Initialization not complete, timed out\n", __func__); sdw_show_ping_status(slave->bus, true); diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c index cd4d01ef22ac4d..ed0e230fc00977 100644 --- a/sound/soc/codecs/rt715-sdca-sdw.c +++ b/sound/soc/codecs/rt715-sdca-sdw.c @@ -139,17 +139,17 @@ static int rt715_sdca_update_status(struct sdw_slave *slave, if (slave->unattach_request) { regcache_cache_only(rt715->regmap, false); regcache_sync_region(rt715->regmap, - SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, RT715_SDCA_ST_CTRL, - CH_00), - SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN, - RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00)); + SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, + RT715_SDCA_ST_CTRL, CH_00), + SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN, + RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00)); regcache_cache_only(rt715->mbq_regmap, false); regcache_sync_region(rt715->mbq_regmap, 0x2000000, 0x61020ff); regcache_sync_region(rt715->mbq_regmap, - SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, RT715_SDCA_ST_CTRL, - CH_00), - SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN, - RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00)); + SDW_SDCA_CTL(FUN_JACK_CODEC, RT715_SDCA_ST_EN, + RT715_SDCA_ST_CTRL, CH_00), + SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_SMPU_TRIG_ST_EN, + RT715_SDCA_SMPU_TRIG_ST_CTRL, CH_00)); } return ret;