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

Commit d781c23e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and... 

Merge remote-tracking branches 'asoc/topic/pm-ops', 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next
parents acb47ad5 42d1b8ce 637c4497 618718dc

sound/soc/codecs/wm2200.c

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

#endif



static struct dev_pm_ops wm2200_pm = {

static const struct dev_pm_ops wm2200_pm = {

	SET_RUNTIME_PM_OPS(wm2200_runtime_suspend, wm2200_runtime_resume,

			   NULL)

};

sound/soc/codecs/wm5100.c

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

#endif



static struct dev_pm_ops wm5100_pm = {

static const struct dev_pm_ops wm5100_pm = {

	SET_RUNTIME_PM_OPS(wm5100_runtime_suspend, wm5100_runtime_resume,

			   NULL)

};

sound/soc/codecs/wm8962.c

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

#endif



static struct dev_pm_ops wm8962_pm = {

static const struct dev_pm_ops wm8962_pm = {

	SET_RUNTIME_PM_OPS(wm8962_runtime_suspend, wm8962_runtime_resume, NULL)

};

sound/soc/pxa/mmp-pcm.c

+1 −8
Original line number Diff line number Diff line
@@ -232,13 +232,7 @@ static int mmp_pcm_probe(struct platform_device *pdev) 
		mmp_pcm_hardware[SNDRV_PCM_STREAM_CAPTURE].period_bytes_max =

						pdata->period_max_capture;

	}

	return snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);

}



static int mmp_pcm_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	return 0;

	return devm_snd_soc_register_platform(&pdev->dev, &mmp_soc_platform);

}



static struct platform_driver mmp_pcm_driver = {
@@ -247,7 +241,6 @@ static struct platform_driver mmp_pcm_driver = { 
	},



	.probe = mmp_pcm_probe,

	.remove = mmp_pcm_remove,

};



module_platform_driver(mmp_pcm_driver);

sound/soc/pxa/pxa-ssp.c

+2 −9
Original line number Diff line number Diff line
@@ -813,16 +813,10 @@ static const struct of_device_id pxa_ssp_of_ids[] = { 


static int asoc_ssp_probe(struct platform_device *pdev)

{

	return snd_soc_register_component(&pdev->dev, &pxa_ssp_component,

	return devm_snd_soc_register_component(&pdev->dev, &pxa_ssp_component,

					       &pxa_ssp_dai, 1);

}



static int asoc_ssp_remove(struct platform_device *pdev)

{

	snd_soc_unregister_component(&pdev->dev);

	return 0;

}



static struct platform_driver asoc_ssp_driver = {

	.driver = {

		.name = "pxa-ssp-dai",
@@ -830,7 +824,6 @@ static struct platform_driver asoc_ssp_driver = { 
	},



	.probe = asoc_ssp_probe,

	.remove = asoc_ssp_remove,

};



module_platform_driver(asoc_ssp_driver);