Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 641d334b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under sound/.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Acked-by: default avatarBrian Austin <brian.austin@cirrus.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
parent 7ba37053

sound/pci/hda/hda_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -1676,7 +1676,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) 
	u8 sd_status;

	int i;



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

	if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)

		if (!pm_runtime_active(chip->card->dev))

			return IRQ_NONE;

sound/pci/hda/hda_intel.c

+1 −4
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ static int azx_resume(struct device *dev) 
}

#endif /* CONFIG_PM_SLEEP || SUPPORT_VGA_SWITCHEROO */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int azx_runtime_suspend(struct device *dev)

{

	struct snd_card *card = dev_get_drvdata(dev);
@@ -955,9 +955,6 @@ static int azx_runtime_idle(struct device *dev) 
	return 0;

}



#endif /* CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM

static const struct dev_pm_ops azx_pm = {

	SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume)

	SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, azx_runtime_idle)

sound/soc/codecs/cs35l32.c

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ static int cs35l32_i2c_remove(struct i2c_client *i2c_client) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int cs35l32_runtime_suspend(struct device *dev)

{

	struct cs35l32_private *cs35l32 = dev_get_drvdata(dev);

sound/soc/codecs/cs42xx8.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ int cs42xx8_probe(struct device *dev, struct regmap *regmap) 
}

EXPORT_SYMBOL_GPL(cs42xx8_probe);



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int cs42xx8_runtime_resume(struct device *dev)

{

	struct cs42xx8_priv *cs42xx8 = dev_get_drvdata(dev);

sound/soc/codecs/max98090.c

+1 −1
Original line number Diff line number Diff line
@@ -2492,7 +2492,7 @@ static int max98090_i2c_remove(struct i2c_client *client) 
	return 0;

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int max98090_runtime_resume(struct device *dev)

{

	struct max98090_priv *max98090 = dev_get_drvdata(dev);