aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-08-21 08:59:21 -0400
committerMark Brown <broonie@kernel.org>2015-08-21 12:07:19 -0400
commit54d8697fa5036df0e27f8d62edb7ebc35c3f73d6 (patch)
tree380b4f70036de9f46f81e0e8377f5d7bcea1de55
parentebb75c0bdba238013976b53e256f8d13216304e4 (diff)
ASoC: Set missing card owner field
Set the card owner field to prevent the module from being removed from underneath its users. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/blackfin/bfin-eval-adau1x61.c1
-rw-r--r--sound/soc/intel/boards/byt-max98090.c1
-rw-r--r--sound/soc/intel/boards/byt-rt5640.c1
-rw-r--r--sound/soc/intel/boards/bytcr_rt5640.c1
-rw-r--r--sound/soc/intel/boards/cht_bsw_max98090_ti.c1
-rw-r--r--sound/soc/intel/boards/cht_bsw_rt5645.c2
-rw-r--r--sound/soc/intel/boards/cht_bsw_rt5672.c1
-rw-r--r--sound/soc/mediatek/mt8173-max98090.c1
-rw-r--r--sound/soc/mediatek/mt8173-rt5650-rt5676.c1
-rw-r--r--sound/soc/rockchip/rockchip_max98090.c1
-rw-r--r--sound/soc/rockchip/rockchip_rt5645.c1
-rw-r--r--sound/soc/samsung/arndale_rt5631.c1
-rw-r--r--sound/soc/samsung/snow.c1
13 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bfin-eval-adau1x61.c b/sound/soc/blackfin/bfin-eval-adau1x61.c
index 4229f76daec9..fddfe00c9d69 100644
--- a/sound/soc/blackfin/bfin-eval-adau1x61.c
+++ b/sound/soc/blackfin/bfin-eval-adau1x61.c
@@ -108,6 +108,7 @@ static struct snd_soc_dai_link bfin_eval_adau1x61_dai = {
108 108
109static struct snd_soc_card bfin_eval_adau1x61 = { 109static struct snd_soc_card bfin_eval_adau1x61 = {
110 .name = "bfin-eval-adau1x61", 110 .name = "bfin-eval-adau1x61",
111 .owner = THIS_MODULE,
111 .driver_name = "eval-adau1x61", 112 .driver_name = "eval-adau1x61",
112 .dai_link = &bfin_eval_adau1x61_dai, 113 .dai_link = &bfin_eval_adau1x61_dai,
113 .num_links = 1, 114 .num_links = 1,
diff --git a/sound/soc/intel/boards/byt-max98090.c b/sound/soc/intel/boards/byt-max98090.c
index 7ab8cc9fbfd5..d9f81b8d915d 100644
--- a/sound/soc/intel/boards/byt-max98090.c
+++ b/sound/soc/intel/boards/byt-max98090.c
@@ -126,6 +126,7 @@ static struct snd_soc_dai_link byt_max98090_dais[] = {
126 126
127static struct snd_soc_card byt_max98090_card = { 127static struct snd_soc_card byt_max98090_card = {
128 .name = "byt-max98090", 128 .name = "byt-max98090",
129 .owner = THIS_MODULE,
129 .dai_link = byt_max98090_dais, 130 .dai_link = byt_max98090_dais,
130 .num_links = ARRAY_SIZE(byt_max98090_dais), 131 .num_links = ARRAY_SIZE(byt_max98090_dais),
131 .dapm_widgets = byt_max98090_widgets, 132 .dapm_widgets = byt_max98090_widgets,
diff --git a/sound/soc/intel/boards/byt-rt5640.c b/sound/soc/intel/boards/byt-rt5640.c
index ae89b9b966d9..de9788a3fd06 100644
--- a/sound/soc/intel/boards/byt-rt5640.c
+++ b/sound/soc/intel/boards/byt-rt5640.c
@@ -197,6 +197,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
197 197
198static struct snd_soc_card byt_rt5640_card = { 198static struct snd_soc_card byt_rt5640_card = {
199 .name = "byt-rt5640", 199 .name = "byt-rt5640",
200 .owner = THIS_MODULE,
200 .dai_link = byt_rt5640_dais, 201 .dai_link = byt_rt5640_dais,
201 .num_links = ARRAY_SIZE(byt_rt5640_dais), 202 .num_links = ARRAY_SIZE(byt_rt5640_dais),
202 .dapm_widgets = byt_rt5640_widgets, 203 .dapm_widgets = byt_rt5640_widgets,
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 7f55d59024a8..c4453120b11a 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -185,6 +185,7 @@ static struct snd_soc_dai_link byt_dailink[] = {
185/* SoC card */ 185/* SoC card */
186static struct snd_soc_card snd_soc_card_byt = { 186static struct snd_soc_card snd_soc_card_byt = {
187 .name = "baytrailcraudio", 187 .name = "baytrailcraudio",
188 .owner = THIS_MODULE,
188 .dai_link = byt_dailink, 189 .dai_link = byt_dailink,
189 .num_links = ARRAY_SIZE(byt_dailink), 190 .num_links = ARRAY_SIZE(byt_dailink),
190 .dapm_widgets = byt_dapm_widgets, 191 .dapm_widgets = byt_dapm_widgets,
diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
index d604ee80eda4..cd2595362c10 100644
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
@@ -279,6 +279,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
279/* SoC card */ 279/* SoC card */
280static struct snd_soc_card snd_soc_card_cht = { 280static struct snd_soc_card snd_soc_card_cht = {
281 .name = "chtmax98090", 281 .name = "chtmax98090",
282 .owner = THIS_MODULE,
282 .dai_link = cht_dailink, 283 .dai_link = cht_dailink,
283 .num_links = ARRAY_SIZE(cht_dailink), 284 .num_links = ARRAY_SIZE(cht_dailink),
284 .aux_dev = &cht_max98090_headset_dev, 285 .aux_dev = &cht_max98090_headset_dev,
diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c
index bdcaf467842a..7be8461e4d3b 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
@@ -305,6 +305,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
305/* SoC card */ 305/* SoC card */
306static struct snd_soc_card snd_soc_card_chtrt5645 = { 306static struct snd_soc_card snd_soc_card_chtrt5645 = {
307 .name = "chtrt5645", 307 .name = "chtrt5645",
308 .owner = THIS_MODULE,
308 .dai_link = cht_dailink, 309 .dai_link = cht_dailink,
309 .num_links = ARRAY_SIZE(cht_dailink), 310 .num_links = ARRAY_SIZE(cht_dailink),
310 .dapm_widgets = cht_dapm_widgets, 311 .dapm_widgets = cht_dapm_widgets,
@@ -317,6 +318,7 @@ static struct snd_soc_card snd_soc_card_chtrt5645 = {
317 318
318static struct snd_soc_card snd_soc_card_chtrt5650 = { 319static struct snd_soc_card snd_soc_card_chtrt5650 = {
319 .name = "chtrt5650", 320 .name = "chtrt5650",
321 .owner = THIS_MODULE,
320 .dai_link = cht_dailink, 322 .dai_link = cht_dailink,
321 .num_links = ARRAY_SIZE(cht_dailink), 323 .num_links = ARRAY_SIZE(cht_dailink),
322 .dapm_widgets = cht_dapm_widgets, 324 .dapm_widgets = cht_dapm_widgets,
diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
index 2c9cc5be439e..23fe04075142 100644
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
@@ -323,6 +323,7 @@ static int cht_resume_post(struct snd_soc_card *card)
323/* SoC card */ 323/* SoC card */
324static struct snd_soc_card snd_soc_card_cht = { 324static struct snd_soc_card snd_soc_card_cht = {
325 .name = "cherrytrailcraudio", 325 .name = "cherrytrailcraudio",
326 .owner = THIS_MODULE,
326 .dai_link = cht_dailink, 327 .dai_link = cht_dailink,
327 .num_links = ARRAY_SIZE(cht_dailink), 328 .num_links = ARRAY_SIZE(cht_dailink),
328 .dapm_widgets = cht_dapm_widgets, 329 .dapm_widgets = cht_dapm_widgets,
diff --git a/sound/soc/mediatek/mt8173-max98090.c b/sound/soc/mediatek/mt8173-max98090.c
index 4d44b5803e55..fb8f97e77fdf 100644
--- a/sound/soc/mediatek/mt8173-max98090.c
+++ b/sound/soc/mediatek/mt8173-max98090.c
@@ -139,6 +139,7 @@ static struct snd_soc_dai_link mt8173_max98090_dais[] = {
139 139
140static struct snd_soc_card mt8173_max98090_card = { 140static struct snd_soc_card mt8173_max98090_card = {
141 .name = "mt8173-max98090", 141 .name = "mt8173-max98090",
142 .owner = THIS_MODULE,
142 .dai_link = mt8173_max98090_dais, 143 .dai_link = mt8173_max98090_dais,
143 .num_links = ARRAY_SIZE(mt8173_max98090_dais), 144 .num_links = ARRAY_SIZE(mt8173_max98090_dais),
144 .controls = mt8173_max98090_controls, 145 .controls = mt8173_max98090_controls,
diff --git a/sound/soc/mediatek/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
index 094055323059..caf8c47b3710 100644
--- a/sound/soc/mediatek/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173-rt5650-rt5676.c
@@ -194,6 +194,7 @@ static struct snd_soc_codec_conf mt8173_rt5650_rt5676_codec_conf[] = {
194 194
195static struct snd_soc_card mt8173_rt5650_rt5676_card = { 195static struct snd_soc_card mt8173_rt5650_rt5676_card = {
196 .name = "mtk-rt5650-rt5676", 196 .name = "mtk-rt5650-rt5676",
197 .owner = THIS_MODULE,
197 .dai_link = mt8173_rt5650_rt5676_dais, 198 .dai_link = mt8173_rt5650_rt5676_dais,
198 .num_links = ARRAY_SIZE(mt8173_rt5650_rt5676_dais), 199 .num_links = ARRAY_SIZE(mt8173_rt5650_rt5676_dais),
199 .codec_conf = mt8173_rt5650_rt5676_codec_conf, 200 .codec_conf = mt8173_rt5650_rt5676_codec_conf,
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index acace20d4127..cc26f81ee4ff 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -147,6 +147,7 @@ static struct snd_soc_dai_link rk_dailink = {
147 147
148static struct snd_soc_card snd_soc_card_rk = { 148static struct snd_soc_card snd_soc_card_rk = {
149 .name = "ROCKCHIP-I2S", 149 .name = "ROCKCHIP-I2S",
150 .owner = THIS_MODULE,
150 .dai_link = &rk_dailink, 151 .dai_link = &rk_dailink,
151 .num_links = 1, 152 .num_links = 1,
152 .aux_dev = &rk_98090_headset_dev, 153 .aux_dev = &rk_98090_headset_dev,
diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 3c6bb1ea06ec..09402799c8dc 100644
--- a/sound/soc/rockchip/rockchip_rt5645.c
+++ b/sound/soc/rockchip/rockchip_rt5645.c
@@ -146,6 +146,7 @@ static struct snd_soc_dai_link rk_dailink = {
146 146
147static struct snd_soc_card snd_soc_card_rk = { 147static struct snd_soc_card snd_soc_card_rk = {
148 .name = "I2S-RT5650", 148 .name = "I2S-RT5650",
149 .owner = THIS_MODULE,
149 .dai_link = &rk_dailink, 150 .dai_link = &rk_dailink,
150 .num_links = 1, 151 .num_links = 1,
151 .dapm_widgets = rk_dapm_widgets, 152 .dapm_widgets = rk_dapm_widgets,
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index 8bf2e2c4bafb..323aa0d8e583 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -71,6 +71,7 @@ static struct snd_soc_dai_link arndale_rt5631_dai[] = {
71 71
72static struct snd_soc_card arndale_rt5631 = { 72static struct snd_soc_card arndale_rt5631 = {
73 .name = "Arndale RT5631", 73 .name = "Arndale RT5631",
74 .owner = THIS_MODULE,
74 .dai_link = arndale_rt5631_dai, 75 .dai_link = arndale_rt5631_dai,
75 .num_links = ARRAY_SIZE(arndale_rt5631_dai), 76 .num_links = ARRAY_SIZE(arndale_rt5631_dai),
76}; 77};
diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
index 7651dc924161..07ce2cfa4845 100644
--- a/sound/soc/samsung/snow.c
+++ b/sound/soc/samsung/snow.c
@@ -56,6 +56,7 @@ static int snow_late_probe(struct snd_soc_card *card)
56 56
57static struct snd_soc_card snow_snd = { 57static struct snd_soc_card snow_snd = {
58 .name = "Snow-I2S", 58 .name = "Snow-I2S",
59 .owner = THIS_MODULE,
59 .dai_link = snow_dai, 60 .dai_link = snow_dai,
60 .num_links = ARRAY_SIZE(snow_dai), 61 .num_links = ARRAY_SIZE(snow_dai),
61 62