|
| 1 | +From 0d29e9fa4b11fd45bd4064a371baecb8e21e1610 Mon Sep 17 00:00:00 2001 |
| 2 | +From: The-going <48602507+The-going@users.noreply.github.com> |
| 3 | +Date: Tue, 11 Mar 2025 21:01:36 +0300 |
| 4 | +Subject: [PATCH] Fix: error: incompatible pointer type, warning: no previous |
| 5 | + prototype |
| 6 | + |
| 7 | +--- |
| 8 | + sound/soc/soc-core.c | 6 +++--- |
| 9 | + sound/soc/sunxi_v2/snd_sunxi_ahub.h | 7 +++++++ |
| 10 | + sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h | 5 ++++- |
| 11 | + sound/soc/sunxi_v2/snd_sunxi_mach.c | 4 ++-- |
| 12 | + sound/soc/sunxi_v2/snd_sunxi_mach.h | 3 +++ |
| 13 | + 5 files changed, 19 insertions(+), 6 deletions(-) |
| 14 | + |
| 15 | +diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c |
| 16 | +index ec05135e25fa..798a2bae1698 100644 |
| 17 | +--- a/sound/soc/soc-core.c |
| 18 | ++++ b/sound/soc/soc-core.c |
| 19 | +@@ -2629,7 +2629,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, |
| 20 | + { |
| 21 | + struct device *dev = component->dev; |
| 22 | + struct snd_soc_dai *dai; |
| 23 | +- struct snd_soc_dai_ops *ops; /* REMOVE ME */ |
| 24 | ++ /* struct snd_soc_dai_ops *ops; REMOVE ME */ |
| 25 | + |
| 26 | + lockdep_assert_held(&client_mutex); |
| 27 | + |
| 28 | +@@ -2658,7 +2658,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, |
| 29 | + if (!dai->name) |
| 30 | + return NULL; |
| 31 | + |
| 32 | +- /* REMOVE ME */ |
| 33 | ++ /* REMOVE ME |
| 34 | + if (dai_drv->probe || |
| 35 | + dai_drv->remove || |
| 36 | + dai_drv->compress_new || |
| 37 | +@@ -2680,7 +2680,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, |
| 38 | + ops->remove_order = dai_drv->remove_order; |
| 39 | + |
| 40 | + dai_drv->ops = ops; |
| 41 | +- } |
| 42 | ++ } */ |
| 43 | + |
| 44 | + dai->component = component; |
| 45 | + dai->dev = dev; |
| 46 | +diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub.h b/sound/soc/sunxi_v2/snd_sunxi_ahub.h |
| 47 | +index b3c1cc592844..cd4be46b6ebf 100644 |
| 48 | +--- a/sound/soc/sunxi_v2/snd_sunxi_ahub.h |
| 49 | ++++ b/sound/soc/sunxi_v2/snd_sunxi_ahub.h |
| 50 | +@@ -64,4 +64,11 @@ struct sunxi_ahub_info { |
| 51 | + unsigned int bclk_freq; |
| 52 | + }; |
| 53 | + |
| 54 | ++int sunxi_loopback_debug_get(struct snd_kcontrol *kcontrol, |
| 55 | ++ struct snd_ctl_elem_value *ucontrol); |
| 56 | ++int sunxi_loopback_debug_set(struct snd_kcontrol *kcontrol, |
| 57 | ++ struct snd_ctl_elem_value *ucontrol); |
| 58 | ++int __init sunxi_ahub_dev_init(void); |
| 59 | ++void __exit sunxi_ahub_dev_exit(void); |
| 60 | ++ |
| 61 | + #endif /* __SND_SUNXI_AHUB_H */ |
| 62 | +diff --git a/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h |
| 63 | +index b7679bf545e9..436742d87e8f 100644 |
| 64 | +--- a/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h |
| 65 | ++++ b/sound/soc/sunxi_v2/snd_sunxi_ahub_dam.h |
| 66 | +@@ -288,4 +288,7 @@ struct sunxi_ahub_clk_info { |
| 67 | + extern int snd_soc_sunxi_ahub_mem_get(struct sunxi_ahub_mem_info *mem_info); |
| 68 | + extern int snd_soc_sunxi_ahub_clk_get(struct sunxi_ahub_clk_info *clk_info); |
| 69 | + |
| 70 | +-#endif /* __SND_SUNXI_AHUB_DAM_H */ |
| 71 | +\ No newline at end of file |
| 72 | ++int __init sunxi_ahub_dam_dev_init(void); |
| 73 | ++void __exit sunxi_ahub_dam_dev_exit(void); |
| 74 | ++ |
| 75 | ++#endif /* __SND_SUNXI_AHUB_DAM_H */ |
| 76 | +diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach.c b/sound/soc/sunxi_v2/snd_sunxi_mach.c |
| 77 | +index ea73eced251e..74d276a2da92 100644 |
| 78 | +--- a/sound/soc/sunxi_v2/snd_sunxi_mach.c |
| 79 | ++++ b/sound/soc/sunxi_v2/snd_sunxi_mach.c |
| 80 | +@@ -43,8 +43,8 @@ static int asoc_simple_hw_params(struct snd_pcm_substream *substream, |
| 81 | + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); |
| 82 | + |
| 83 | + struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card); |
| 84 | +- struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, rtd->num); |
| 85 | +- struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num); |
| 86 | ++ struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, rtd->id); |
| 87 | ++ struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->id); |
| 88 | + struct asoc_simple_dai *dais = priv->dais; |
| 89 | + unsigned int mclk; |
| 90 | + unsigned int cpu_pll_clk, codec_pll_clk; |
| 91 | +diff --git a/sound/soc/sunxi_v2/snd_sunxi_mach.h b/sound/soc/sunxi_v2/snd_sunxi_mach.h |
| 92 | +index ab429c8841ab..6f9ea8ccf8b5 100644 |
| 93 | +--- a/sound/soc/sunxi_v2/snd_sunxi_mach.h |
| 94 | ++++ b/sound/soc/sunxi_v2/snd_sunxi_mach.h |
| 95 | +@@ -14,4 +14,7 @@ |
| 96 | + |
| 97 | + #include "snd_sunxi_mach_utils.h" |
| 98 | + |
| 99 | ++int __init sunxi_soundcard_machine_dev_init(void); |
| 100 | ++void __exit sunxi_soundcard_machine_dev_exit(void); |
| 101 | ++ |
| 102 | + #endif /* __SND_SUNXI_MACH_H */ |
| 103 | +-- |
| 104 | +2.35.3 |
| 105 | + |
0 commit comments