Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / sof / ops.h

diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index 5099ad03df72fd1017d60279a6a3ba9d1119b005..323a0b3f561bdf525c1252ff4e44aa5d2e012ffc 100644 (file)
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -497,12 +497,10 @@ snd_sof_machine_select(struct snd_sof_dev *sdev)
 
 static inline void
 snd_sof_set_mach_params(const struct snd_soc_acpi_mach *mach,
-                       struct device *dev)
+                       struct snd_sof_dev *sdev)
 {
-       struct snd_sof_dev *sdev = dev_get_drvdata(dev);
-
        if (sof_ops(sdev) && sof_ops(sdev)->set_mach_params)
-               sof_ops(sdev)->set_mach_params(mach, dev);
+               sof_ops(sdev)->set_mach_params(mach, sdev);
 }
 
 static inline const struct snd_sof_dsp_ops