change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/sound/soc/samsung/dmaengine.c
..
..
@@ -1,19 +1,9 @@
1
-/*
2
- * dmaengine.c - Samsung dmaengine wrapper
3
- *
4
- * Author: Mark Brown <broonie@linaro.org>
5
- * Copyright 2013 Linaro
6
- *
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * version 2 as published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope that it will be useful, but
12
- * WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
- * General Public License for more details.
15
- *
16
- */
1
+// SPDX-License-Identifier: GPL-2.0
2
+//
3
+// dmaengine.c - Samsung dmaengine wrapper
4
+//
5
+// Author: Mark Brown <broonie@linaro.org>
6
+// Copyright 2013 Linaro
17
7
 
18
8
 #include <linux/module.h>
19
9
 #include <sound/core.h>
..
..
@@ -25,9 +15,9 @@
25
15
 #include "dma.h"
26
16
 
27
17
 int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,
28
-				       const char *tx, const char *rx)
18
+				       const char *tx, const char *rx,
19
+				       struct device *dma_dev)
29
20
 {
30
-	unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT;
31
21
 	struct snd_dmaengine_pcm_config *pcm_conf;
32
22
 
33
23
 	pcm_conf = devm_kzalloc(dev, sizeof(*pcm_conf), GFP_KERNEL);
..
..
@@ -36,15 +26,13 @@
36
26
 
37
27
 	pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
38
28
 	pcm_conf->compat_filter_fn = filter;
29
+	pcm_conf->dma_dev = dma_dev;
39
30
 
40
-	if (dev->of_node) {
41
-		pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;
42
-		pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;
43
-	} else {
44
-		flags |= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME;
45
-	}
31
+	pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;
32
+	pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;
46
33
 
47
-	return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags);
34
+	return devm_snd_dmaengine_pcm_register(dev, pcm_conf,
35
+				SND_DMAENGINE_PCM_FLAG_COMPAT);
48
36
 }
49
37
 EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);
50
38