lkml.org 
[lkml]   [2022]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 190/231] ASoC: codecs: rt700/rt711/rt711-sdca: initialize workqueues in probe
    Date
    From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

    [ Upstream commit ba98d7d8b60ba410aa03834f6aa48fd3b2e68478 ]

    The workqueues are initialized in the io_init functions, which isn't
    quite right. In some tests, this leads to warnings throw from
    __queue_delayed_work()

    WARN_ON_FUNCTION_MISMATCH(timer->function, delayed_work_timer_fn);

    Move all the initializations to the probe functions.

    Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Reviewed-by: Rander Wang <rander.wang@intel.com>
    Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
    Link: https://lore.kernel.org/r/20220606203752.144159-7-pierre-louis.bossart@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/rt700.c | 12 +++++-------
    sound/soc/codecs/rt711-sdca.c | 10 +++-------
    sound/soc/codecs/rt711.c | 12 +++++-------
    3 files changed, 13 insertions(+), 21 deletions(-)

    --- a/sound/soc/codecs/rt700.c
    +++ b/sound/soc/codecs/rt700.c
    @@ -1124,6 +1124,11 @@ int rt700_init(struct device *dev, struc

    mutex_init(&rt700->disable_irq_lock);

    + INIT_DELAYED_WORK(&rt700->jack_detect_work,
    + rt700_jack_detect_handler);
    + INIT_DELAYED_WORK(&rt700->jack_btn_check_work,
    + rt700_btn_check_handler);
    +
    /*
    * Mark hw_init to false
    * HW init will be performed when device reports present
    @@ -1218,13 +1223,6 @@ int rt700_io_init(struct device *dev, st
    /* Finish Initial Settings, set power to D3 */
    regmap_write(rt700->regmap, RT700_SET_AUDIO_POWER_STATE, AC_PWRST_D3);

    - if (!rt700->first_hw_init) {
    - INIT_DELAYED_WORK(&rt700->jack_detect_work,
    - rt700_jack_detect_handler);
    - INIT_DELAYED_WORK(&rt700->jack_btn_check_work,
    - rt700_btn_check_handler);
    - }
    -
    /*
    * if set_jack callback occurred early than io_init,
    * we set up the jack detection function now
    --- a/sound/soc/codecs/rt711-sdca.c
    +++ b/sound/soc/codecs/rt711-sdca.c
    @@ -1417,6 +1417,9 @@ int rt711_sdca_init(struct device *dev,
    mutex_init(&rt711->calibrate_mutex);
    mutex_init(&rt711->disable_irq_lock);

    + INIT_DELAYED_WORK(&rt711->jack_detect_work, rt711_sdca_jack_detect_handler);
    + INIT_DELAYED_WORK(&rt711->jack_btn_check_work, rt711_sdca_btn_check_handler);
    +
    /*
    * Mark hw_init to false
    * HW init will be performed when device reports present
    @@ -1548,13 +1551,6 @@ int rt711_sdca_io_init(struct device *de
    rt711_sdca_index_update_bits(rt711, RT711_VENDOR_HDA_CTL,
    RT711_PUSH_BTN_INT_CTL0, 0x20, 0x00);

    - if (!rt711->first_hw_init) {
    - INIT_DELAYED_WORK(&rt711->jack_detect_work,
    - rt711_sdca_jack_detect_handler);
    - INIT_DELAYED_WORK(&rt711->jack_btn_check_work,
    - rt711_sdca_btn_check_handler);
    - }
    -
    /* calibration */
    ret = rt711_sdca_calibration(rt711);
    if (ret < 0)
    --- a/sound/soc/codecs/rt711.c
    +++ b/sound/soc/codecs/rt711.c
    @@ -1209,6 +1209,10 @@ int rt711_init(struct device *dev, struc
    mutex_init(&rt711->calibrate_mutex);
    mutex_init(&rt711->disable_irq_lock);

    + INIT_DELAYED_WORK(&rt711->jack_detect_work, rt711_jack_detect_handler);
    + INIT_DELAYED_WORK(&rt711->jack_btn_check_work, rt711_btn_check_handler);
    + INIT_WORK(&rt711->calibration_work, rt711_calibration_work);
    +
    /*
    * Mark hw_init to false
    * HW init will be performed when device reports present
    @@ -1316,14 +1320,8 @@ int rt711_io_init(struct device *dev, st

    if (rt711->first_hw_init)
    rt711_calibration(rt711);
    - else {
    - INIT_DELAYED_WORK(&rt711->jack_detect_work,
    - rt711_jack_detect_handler);
    - INIT_DELAYED_WORK(&rt711->jack_btn_check_work,
    - rt711_btn_check_handler);
    - INIT_WORK(&rt711->calibration_work, rt711_calibration_work);
    + else
    schedule_work(&rt711->calibration_work);
    - }

    /*
    * if set_jack callback occurred early than io_init,

    \
     
     \ /
      Last update: 2022-07-19 15:08    [W:2.523 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site