Unverified Commit ebfbcfc7 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Convert to modern PM macros 

Merge series from Takashi Iwai <tiwai@suse.de>:

This is a revised series of small and trivial patches to convert to
the newer PM macros, e.g. from SET_RUNTIME_PM_OPS() to
RUNTIME_PM_OPS().

The conversions are systematic, and we could reduce messy
__maybe_unused and ifdefs with those changes.

Merely code refactoring, and shouldn't change the actual driver
behavior.
parents aaf08d73 15559cde

sound/soc/amd/acp/acp-pci.c

+5 −5
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id 
	return ret;

};



static int __maybe_unused snd_acp_suspend(struct device *dev)

static int snd_acp_suspend(struct device *dev)

{

	struct acp_chip_info *chip;

	int ret;
@@ -233,7 +233,7 @@ static int __maybe_unused snd_acp_suspend(struct device *dev) 
	return ret;

}



static int __maybe_unused snd_acp_resume(struct device *dev)

static int snd_acp_resume(struct device *dev)

{

	struct acp_chip_info *chip;

	int ret;
@@ -251,8 +251,8 @@ static int __maybe_unused snd_acp_resume(struct device *dev) 
}



static const struct dev_pm_ops acp_pm_ops = {

	SET_RUNTIME_PM_OPS(snd_acp_suspend, snd_acp_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(snd_acp_suspend, snd_acp_resume)

	RUNTIME_PM_OPS(snd_acp_suspend, snd_acp_resume, NULL)

	SYSTEM_SLEEP_PM_OPS(snd_acp_suspend, snd_acp_resume)

};



static void acp_pci_remove(struct pci_dev *pci)
@@ -289,7 +289,7 @@ static struct pci_driver snd_amd_acp_pci_driver = { 
	.probe = acp_pci_probe,

	.remove = acp_pci_remove,

	.driver = {

		.pm = &acp_pm_ops,

		.pm = pm_ptr(&acp_pm_ops),

	},

};

module_pci_driver(snd_amd_acp_pci_driver);

sound/soc/amd/acp/acp-rembrandt.c

+3 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void rembrandt_audio_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused rmb_pcm_resume(struct device *dev)

static int rmb_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_stream *stream;
@@ -227,7 +227,7 @@ static int __maybe_unused rmb_pcm_resume(struct device *dev) 
}



static const struct dev_pm_ops rmb_dma_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, rmb_pcm_resume)

	SYSTEM_SLEEP_PM_OPS(NULL, rmb_pcm_resume)

};



static struct platform_driver rembrandt_driver = {
@@ -235,7 +235,7 @@ static struct platform_driver rembrandt_driver = { 
	.remove = rembrandt_audio_remove,

	.driver = {

		.name = "acp_asoc_rembrandt",

		.pm = &rmb_dma_pm_ops,

		.pm = pm_ptr(&rmb_dma_pm_ops),

	},

};

sound/soc/amd/acp/acp-renoir.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void renoir_audio_remove(struct platform_device *pdev) 
	acp_platform_unregister(dev);

}



static int __maybe_unused rn_pcm_resume(struct device *dev)

static int rn_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_stream *stream;
@@ -171,7 +171,7 @@ static int __maybe_unused rn_pcm_resume(struct device *dev) 
}



static const struct dev_pm_ops rn_dma_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, rn_pcm_resume)

	SYSTEM_SLEEP_PM_OPS(NULL, rn_pcm_resume)

};



static struct platform_driver renoir_driver = {
@@ -179,7 +179,7 @@ static struct platform_driver renoir_driver = { 
	.remove = renoir_audio_remove,

	.driver = {

		.name = "acp_asoc_renoir",

		.pm = &rn_dma_pm_ops,

		.pm = pm_ptr(&rn_dma_pm_ops),

	},

};

sound/soc/amd/acp/acp63.c

+3 −3
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static void acp63_audio_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused acp63_pcm_resume(struct device *dev)

static int acp63_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_stream *stream;
@@ -278,7 +278,7 @@ static int __maybe_unused acp63_pcm_resume(struct device *dev) 
}



static const struct dev_pm_ops acp63_dma_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, acp63_pcm_resume)

	SYSTEM_SLEEP_PM_OPS(NULL, acp63_pcm_resume)

};



static struct platform_driver acp63_driver = {
@@ -286,7 +286,7 @@ static struct platform_driver acp63_driver = { 
	.remove = acp63_audio_remove,

	.driver = {

		.name = "acp_asoc_acp63",

		.pm = &acp63_dma_pm_ops,

		.pm = pm_ptr(&acp63_dma_pm_ops),

	},

};

sound/soc/amd/acp/acp70.c

+3 −3
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void acp_acp70_audio_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused acp70_pcm_resume(struct device *dev)

static int acp70_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_stream *stream;
@@ -207,7 +207,7 @@ static int __maybe_unused acp70_pcm_resume(struct device *dev) 
}



static const struct dev_pm_ops acp70_dma_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(NULL, acp70_pcm_resume)

	SYSTEM_SLEEP_PM_OPS(NULL, acp70_pcm_resume)

};



static struct platform_driver acp70_driver = {
@@ -215,7 +215,7 @@ static struct platform_driver acp70_driver = { 
	.remove = acp_acp70_audio_remove,

	.driver = {

		.name = "acp_asoc_acp70",

		.pm = &acp70_dma_pm_ops,

		.pm = pm_ptr(&acp70_dma_pm_ops),

	},

};