tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: blackfin: Convert to devm_snd_soc_register_card
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Axel Lin
and committed by
Mark Brown
76b0d1f5
6ff33f39
+4
-43
+1
-10
sound/soc/blackfin/bf5xx-ad1836.c
+1
-10
sound/soc/blackfin/bf5xx-ad1836.c
···
87
87
card->dev = &pdev->dev;
88
88
platform_set_drvdata(pdev, card);
89
89
90
-
ret = snd_soc_register_card(card);
90
+
ret = devm_snd_soc_register_card(&pdev->dev, card);
91
91
if (ret)
92
92
dev_err(&pdev->dev, "Failed to register card\n");
93
93
return ret;
94
-
}
95
-
96
-
static int bf5xx_ad1836_driver_remove(struct platform_device *pdev)
97
-
{
98
-
struct snd_soc_card *card = platform_get_drvdata(pdev);
99
-
100
-
snd_soc_unregister_card(card);
101
-
return 0;
102
94
}
103
95
104
96
static struct platform_driver bf5xx_ad1836_driver = {
···
99
107
.pm = &snd_soc_pm_ops,
100
108
},
101
109
.probe = bf5xx_ad1836_driver_probe,
102
-
.remove = bf5xx_ad1836_driver_remove,
103
110
};
104
111
module_platform_driver(bf5xx_ad1836_driver);
105
112
+1
-11
sound/soc/blackfin/bfin-eval-adau1373.c
+1
-11
sound/soc/blackfin/bfin-eval-adau1373.c
···
154
154
155
155
card->dev = &pdev->dev;
156
156
157
-
return snd_soc_register_card(&bfin_eval_adau1373);
158
-
}
159
-
160
-
static int bfin_eval_adau1373_remove(struct platform_device *pdev)
161
-
{
162
-
struct snd_soc_card *card = platform_get_drvdata(pdev);
163
-
164
-
snd_soc_unregister_card(card);
165
-
166
-
return 0;
157
+
return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1373);
167
158
}
168
159
169
160
static struct platform_driver bfin_eval_adau1373_driver = {
···
163
172
.pm = &snd_soc_pm_ops,
164
173
},
165
174
.probe = bfin_eval_adau1373_probe,
166
-
.remove = bfin_eval_adau1373_remove,
167
175
};
168
176
169
177
module_platform_driver(bfin_eval_adau1373_driver);
+1
-11
sound/soc/blackfin/bfin-eval-adau1701.c
+1
-11
sound/soc/blackfin/bfin-eval-adau1701.c
···
94
94
95
95
card->dev = &pdev->dev;
96
96
97
-
return snd_soc_register_card(&bfin_eval_adau1701);
98
-
}
99
-
100
-
static int bfin_eval_adau1701_remove(struct platform_device *pdev)
101
-
{
102
-
struct snd_soc_card *card = platform_get_drvdata(pdev);
103
-
104
-
snd_soc_unregister_card(card);
105
-
106
-
return 0;
97
+
return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1701);
107
98
}
108
99
109
100
static struct platform_driver bfin_eval_adau1701_driver = {
···
103
112
.pm = &snd_soc_pm_ops,
104
113
},
105
114
.probe = bfin_eval_adau1701_probe,
106
-
.remove = bfin_eval_adau1701_remove,
107
115
};
108
116
109
117
module_platform_driver(bfin_eval_adau1701_driver);
+1
-11
sound/soc/blackfin/bfin-eval-adav80x.c
+1
-11
sound/soc/blackfin/bfin-eval-adav80x.c
···
119
119
120
120
card->dev = &pdev->dev;
121
121
122
-
return snd_soc_register_card(&bfin_eval_adav80x);
123
-
}
124
-
125
-
static int bfin_eval_adav80x_remove(struct platform_device *pdev)
126
-
{
127
-
struct snd_soc_card *card = platform_get_drvdata(pdev);
128
-
129
-
snd_soc_unregister_card(card);
130
-
131
-
return 0;
122
+
return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adav80x);
132
123
}
133
124
134
125
static const struct platform_device_id bfin_eval_adav80x_ids[] = {
···
135
144
.pm = &snd_soc_pm_ops,
136
145
},
137
146
.probe = bfin_eval_adav80x_probe,
138
-
.remove = bfin_eval_adav80x_remove,
139
147
.id_table = bfin_eval_adav80x_ids,
140
148
};
141
149