ASoC: use to_platform_device() instead of container_of()

jkysela-rh · jkysela-rh · commit d8d5dfaf1172 · 2025-05-13T16:53:04.000+02:00
JIRA: https://issues.redhat.com/browse/RHEL-80682 commit 8728483 Author: Luoxi Li <lee.lockhey@gmail.com> Date: Thu Jan 23 11:39:37 2025 +0800 ASoC: use to_platform_device() instead of container_of() Use the to_platform_device() macro where possible. Signed-off-by: Luoxi Li <lee.lockhey@gmail.com> Link: https://patch.msgid.link/20250123033937.3587880-1-lee.lockhey@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
@@ -1091,8 +1091,7 @@ static int rt5514_set_bias_level(struct snd_soc_component *component,
 static int rt5514_probe(struct snd_soc_component *component)
 {
 	struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);
-	struct platform_device *pdev = container_of(component->dev,
-						   struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(component->dev);
 
 	rt5514->mclk = devm_clk_get_optional(component->dev, "mclk");
 	if (IS_ERR(rt5514->mclk))
diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
@@ -175,8 +175,7 @@ static int imx8_run(struct snd_sof_dev *sdev)
 
 static int imx8_probe(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev =
-		container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct device_node *np = pdev->dev.of_node;
 	struct device_node *res_node;
 	struct resource *mmio;
diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c
@@ -144,8 +144,7 @@ static int imx8m_reset(struct snd_sof_dev *sdev)
 
 static int imx8m_probe(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev =
-		container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct device_node *np = pdev->dev.of_node;
 	struct device_node *res_node;
 	struct resource *mmio;
diff --git a/sound/soc/sof/imx/imx8ulp.c b/sound/soc/sof/imx/imx8ulp.c
@@ -155,8 +155,7 @@ static int imx8ulp_reset(struct snd_sof_dev *sdev)
 
 static int imx8ulp_probe(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev =
-		container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct device_node *np = pdev->dev.of_node;
 	struct device_node *res_node;
 	struct resource *mmio;
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
@@ -410,8 +410,7 @@ static int bdw_probe(struct snd_sof_dev *sdev)
 {
 	struct snd_sof_pdata *pdata = sdev->pdata;
 	const struct sof_dev_desc *desc = pdata->desc;
-	struct platform_device *pdev =
-		container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	const struct sof_intel_dsp_desc *chip;
 	struct resource *mmio;
 	u32 base, size;
diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
@@ -109,8 +109,7 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)
 {
 	struct snd_sof_pdata *pdata = sdev->pdata;
 	const struct sof_dev_desc *desc = pdata->desc;
-	struct platform_device *pdev =
-		container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	const struct sof_intel_dsp_desc *chip;
 	struct resource *mmio;
 	u32 base, size;
diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -238,7 +238,7 @@ static int mt8186_run(struct snd_sof_dev *sdev)
 
 static int mt8186_dsp_probe(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct adsp_priv *priv;
 	int ret;
 
diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c
@@ -228,7 +228,7 @@ static int mt8195_run(struct snd_sof_dev *sdev)
 
 static int mt8195_dsp_probe(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct adsp_priv *priv;
 	int ret;
 
@@ -341,7 +341,7 @@ static int mt8195_dsp_shutdown(struct snd_sof_dev *sdev)
 
 static void mt8195_dsp_remove(struct snd_sof_dev *sdev)
 {
-	struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	struct adsp_priv *priv = sdev->pdata->hw_pdata;
 
 	platform_device_unregister(priv->ipc_dev);
@@ -351,7 +351,7 @@ static void mt8195_dsp_remove(struct snd_sof_dev *sdev)
 
 static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)
 {
-	struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);
+	struct platform_device *pdev = to_platform_device(sdev->dev);
 	int ret;
 	u32 reset_sw, dbg_pc;
 

Original file line number	Diff line number	Diff line change
`@@ -1091,8 +1091,7 @@ static int rt5514_set_bias_level(struct snd_soc_component *component,`
`1091`	`1091`	`static int rt5514_probe(struct snd_soc_component *component)`
`1092`	`1092`	`{`
`1093`	`1093`	`struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);`
`1094`		`- struct platform_device *pdev = container_of(component->dev,`
`1095`		`- struct platform_device, dev);`
	`1094`	`+ struct platform_device *pdev = to_platform_device(component->dev);`
`1096`	`1095`
`1097`	`1096`	`rt5514->mclk = devm_clk_get_optional(component->dev, "mclk");`
`1098`	`1097`	`if (IS_ERR(rt5514->mclk))`
Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,7 @@ static int imx8_run(struct snd_sof_dev *sdev)`
`175`	`175`
`176`	`176`	`static int imx8_probe(struct snd_sof_dev *sdev)`
`177`	`177`	`{`
`178`		`- struct platform_device *pdev =`
`179`		`- container_of(sdev->dev, struct platform_device, dev);`
	`178`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`180`	`179`	`struct device_node *np = pdev->dev.of_node;`
`181`	`180`	`struct device_node *res_node;`
`182`	`181`	`struct resource *mmio;`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,7 @@ static int imx8m_reset(struct snd_sof_dev *sdev)`
`144`	`144`
`145`	`145`	`static int imx8m_probe(struct snd_sof_dev *sdev)`
`146`	`146`	`{`
`147`		`- struct platform_device *pdev =`
`148`		`- container_of(sdev->dev, struct platform_device, dev);`
	`147`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`149`	`148`	`struct device_node *np = pdev->dev.of_node;`
`150`	`149`	`struct device_node *res_node;`
`151`	`150`	`struct resource *mmio;`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,7 @@ static int imx8ulp_reset(struct snd_sof_dev *sdev)`
`155`	`155`
`156`	`156`	`static int imx8ulp_probe(struct snd_sof_dev *sdev)`
`157`	`157`	`{`
`158`		`- struct platform_device *pdev =`
`159`		`- container_of(sdev->dev, struct platform_device, dev);`
	`158`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`160`	`159`	`struct device_node *np = pdev->dev.of_node;`
`161`	`160`	`struct device_node *res_node;`
`162`	`161`	`struct resource *mmio;`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static int mt8186_run(struct snd_sof_dev *sdev)`
`238`	`238`
`239`	`239`	`static int mt8186_dsp_probe(struct snd_sof_dev *sdev)`
`240`	`240`	`{`
`241`		`- struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);`
	`241`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`242`	`242`	`struct adsp_priv *priv;`
`243`	`243`	`int ret;`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ static int mt8195_run(struct snd_sof_dev *sdev)`
`228`	`228`
`229`	`229`	`static int mt8195_dsp_probe(struct snd_sof_dev *sdev)`
`230`	`230`	`{`
`231`		`- struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);`
	`231`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`232`	`232`	`struct adsp_priv *priv;`
`233`	`233`	`int ret;`
`234`	`234`
`@@ -341,7 +341,7 @@ static int mt8195_dsp_shutdown(struct snd_sof_dev *sdev)`
`341`	`341`
`342`	`342`	`static void mt8195_dsp_remove(struct snd_sof_dev *sdev)`
`343`	`343`	`{`
`344`		`- struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);`
	`344`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`345`	`345`	`struct adsp_priv *priv = sdev->pdata->hw_pdata;`
`346`	`346`
`347`	`347`	`platform_device_unregister(priv->ipc_dev);`
`@@ -351,7 +351,7 @@ static void mt8195_dsp_remove(struct snd_sof_dev *sdev)`
`351`	`351`
`352`	`352`	`static int mt8195_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state)`
`353`	`353`	`{`
`354`		`- struct platform_device *pdev = container_of(sdev->dev, struct platform_device, dev);`
	`354`	`+ struct platform_device *pdev = to_platform_device(sdev->dev);`
`355`	`355`	`int ret;`
`356`	`356`	`u32 reset_sw, dbg_pc;`
`357`	`357`