Re: [PATCH 48/51] ALSA: hda: Switch to __pm_runtime_put_autosuspend()

[Takashi Iwai <tiwai@suse.de>]

On Fri, 04 Oct 2024 11:41:45 +0200,
Sakari Ailus wrote:
> 
> pm_runtime_put_autosuspend() will soon be changed to include a call to
> pm_runtime_mark_last_busy(). This patch switches the current users to
> __pm_runtime_put_autosuspend() which will continue to have the
> functionality of old pm_runtime_put_autosuspend().

Many of those calls are with pm_runtime_mark_last_busy().
(Actually the only one without it can be an oversight, it's better to
be with *_mark_last_busy(), too).

Wouldn't it be better to keep without converting and rather drop the
superfluous *_mark_last_busy()?


thanks,

Takashi

> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
>  sound/hda/hdac_device.c         | 2 +-
>  sound/pci/hda/cs35l41_hda.c     | 8 ++++----
>  sound/pci/hda/cs35l56_hda.c     | 2 +-
>  sound/pci/hda/hda_intel.c       | 2 +-
>  sound/pci/hda/tas2781_hda_i2c.c | 6 +++---
>  5 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
> index 3fbb9793dcfc..0cac8e008ff9 100644
> --- a/sound/hda/hdac_device.c
> +++ b/sound/hda/hdac_device.c
> @@ -582,7 +582,7 @@ int snd_hdac_power_down(struct hdac_device *codec)
>  	struct device *dev = &codec->dev;
>  
>  	pm_runtime_mark_last_busy(dev);
> -	return pm_runtime_put_autosuspend(dev);
> +	return __pm_runtime_put_autosuspend(dev);
>  }
>  EXPORT_SYMBOL_GPL(snd_hdac_power_down);
>  
> diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c
> index d68bf7591d90..50d5b1e86d8d 100644
> --- a/sound/pci/hda/cs35l41_hda.c
> +++ b/sound/pci/hda/cs35l41_hda.c
> @@ -805,7 +805,7 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
>  		 * This ensures no amps are playing back when we start putting them to sleep.
>  		 */
>  		pm_runtime_mark_last_busy(dev);
> -		pm_runtime_put_autosuspend(dev);
> +		__pm_runtime_put_autosuspend(dev);
>  		break;
>  	default:
>  		break;
> @@ -1232,7 +1232,7 @@ static void cs35l41_fw_load_work(struct work_struct *work)
>  	mutex_unlock(&cs35l41->fw_mutex);
>  
>  	pm_runtime_mark_last_busy(cs35l41->dev);
> -	pm_runtime_put_autosuspend(cs35l41->dev);
> +	__pm_runtime_put_autosuspend(cs35l41->dev);
>  }
>  
>  static int cs35l41_fw_load_ctl_put(struct snd_kcontrol *kcontrol,
> @@ -1463,7 +1463,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
>  	unlock_system_sleep(sleep_flags);
>  
>  	pm_runtime_mark_last_busy(dev);
> -	pm_runtime_put_autosuspend(dev);
> +	__pm_runtime_put_autosuspend(dev);
>  
>  	dev_info(cs35l41->dev,
>  		 "CS35L41 Bound - SSID: %s, BST: %d, VSPK: %d, CH: %c, FW EN: %d, SPKID: %d\n",
> @@ -1992,7 +1992,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
>  	if (ret)
>  		goto err_pm;
>  
> -	pm_runtime_put_autosuspend(cs35l41->dev);
> +	__pm_runtime_put_autosuspend(cs35l41->dev);
>  
>  	ret = component_add(cs35l41->dev, &cs35l41_hda_comp_ops);
>  	if (ret) {
> diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
> index e3ac0e23ae32..fe482e4367e0 100644
> --- a/sound/pci/hda/cs35l56_hda.c
> +++ b/sound/pci/hda/cs35l56_hda.c
> @@ -91,7 +91,7 @@ static void cs35l56_hda_pause(struct cs35l56_hda *cs35l56)
>  			  BIT(CS35L56_ASP_TX3_EN_SHIFT) | BIT(CS35L56_ASP_TX4_EN_SHIFT));
>  
>  	pm_runtime_mark_last_busy(cs35l56->base.dev);
> -	pm_runtime_put_autosuspend(cs35l56->base.dev);
> +	__pm_runtime_put_autosuspend(cs35l56->base.dev);
>  }
>  
>  static void cs35l56_hda_playback_hook(struct device *dev, int action)
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index b4540c5cd2a6..a462b0745c16 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2351,7 +2351,7 @@ static int azx_probe_continue(struct azx *chip)
>  	if (azx_has_pm_runtime(chip)) {
>  		pm_runtime_use_autosuspend(&pci->dev);
>  		pm_runtime_allow(&pci->dev);
> -		pm_runtime_put_autosuspend(&pci->dev);
> +		__pm_runtime_put_autosuspend(&pci->dev);
>  	}
>  
>  out_free:
> diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c
> index 370d847517f9..7e89b27643c7 100644
> --- a/sound/pci/hda/tas2781_hda_i2c.c
> +++ b/sound/pci/hda/tas2781_hda_i2c.c
> @@ -160,7 +160,7 @@ static void tas2781_hda_playback_hook(struct device *dev, int action)
>  		mutex_unlock(&tas_hda->priv->codec_lock);
>  
>  		pm_runtime_mark_last_busy(dev);
> -		pm_runtime_put_autosuspend(dev);
> +		__pm_runtime_put_autosuspend(dev);
>  		break;
>  	default:
>  		break;
> @@ -698,7 +698,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context)
>  	if (fmw)
>  		release_firmware(fmw);
>  	pm_runtime_mark_last_busy(tas_hda->dev);
> -	pm_runtime_put_autosuspend(tas_hda->dev);
> +	__pm_runtime_put_autosuspend(tas_hda->dev);
>  }
>  
>  static int tas2781_hda_bind(struct device *dev, struct device *master,
> @@ -741,7 +741,7 @@ static int tas2781_hda_bind(struct device *dev, struct device *master,
>  		comp->playback_hook = tas2781_hda_playback_hook;
>  
>  	pm_runtime_mark_last_busy(dev);
> -	pm_runtime_put_autosuspend(dev);
> +	__pm_runtime_put_autosuspend(dev);
>  
>  	return ret;
>  }
> -- 
> 2.39.5
>