projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
sound
/
soc
/
blackfin
/
bf5xx-tdm.c
diff --git
a/sound/soc/blackfin/bf5xx-tdm.c
b/sound/soc/blackfin/bf5xx-tdm.c
index
594f882
..
c1e516e
100644
(file)
--- a/
sound/soc/blackfin/bf5xx-tdm.c
+++ b/
sound/soc/blackfin/bf5xx-tdm.c
@@
-249,7
+249,7
@@
static struct snd_soc_dai_driver bf5xx_tdm_dai = {
.ops = &bf5xx_tdm_dai_ops,
};
.ops = &bf5xx_tdm_dai_ops,
};
-static int
__devinit
bfin_tdm_probe(struct platform_device *pdev)
+static int bfin_tdm_probe(struct platform_device *pdev)
{
struct sport_device *sport_handle;
int ret;
{
struct sport_device *sport_handle;
int ret;
@@
-295,7
+295,7
@@
sport_config_err:
return ret;
}
return ret;
}
-static int
__devexit
bfin_tdm_remove(struct platform_device *pdev)
+static int bfin_tdm_remove(struct platform_device *pdev)
{
struct sport_device *sport_handle = platform_get_drvdata(pdev);
{
struct sport_device *sport_handle = platform_get_drvdata(pdev);
@@
-307,7
+307,7
@@
static int __devexit bfin_tdm_remove(struct platform_device *pdev)
static struct platform_driver bfin_tdm_driver = {
.probe = bfin_tdm_probe,
static struct platform_driver bfin_tdm_driver = {
.probe = bfin_tdm_probe,
- .remove =
__devexit_p(bfin_tdm_remove)
,
+ .remove =
bfin_tdm_remove
,
.driver = {
.name = "bfin-tdm",
.owner = THIS_MODULE,
.driver = {
.name = "bfin-tdm",
.owner = THIS_MODULE,