Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a1fea940
Commit
a1fea940
authored
Jan 21, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: wm8985: Convert to devm_kzalloc()
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
78adaeb2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
sound/soc/codecs/wm8985.c
sound/soc/codecs/wm8985.c
+2
-8
No files found.
sound/soc/codecs/wm8985.c
View file @
a1fea940
...
@@ -1079,7 +1079,7 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
...
@@ -1079,7 +1079,7 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
struct
wm8985_priv
*
wm8985
;
struct
wm8985_priv
*
wm8985
;
int
ret
;
int
ret
;
wm8985
=
kzalloc
(
sizeof
*
wm8985
,
GFP_KERNEL
);
wm8985
=
devm_kzalloc
(
&
spi
->
dev
,
sizeof
*
wm8985
,
GFP_KERNEL
);
if
(
!
wm8985
)
if
(
!
wm8985
)
return
-
ENOMEM
;
return
-
ENOMEM
;
...
@@ -1088,15 +1088,12 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
...
@@ -1088,15 +1088,12 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
ret
=
snd_soc_register_codec
(
&
spi
->
dev
,
ret
=
snd_soc_register_codec
(
&
spi
->
dev
,
&
soc_codec_dev_wm8985
,
&
wm8985_dai
,
1
);
&
soc_codec_dev_wm8985
,
&
wm8985_dai
,
1
);
if
(
ret
<
0
)
kfree
(
wm8985
);
return
ret
;
return
ret
;
}
}
static
int
__devexit
wm8985_spi_remove
(
struct
spi_device
*
spi
)
static
int
__devexit
wm8985_spi_remove
(
struct
spi_device
*
spi
)
{
{
snd_soc_unregister_codec
(
&
spi
->
dev
);
snd_soc_unregister_codec
(
&
spi
->
dev
);
kfree
(
spi_get_drvdata
(
spi
));
return
0
;
return
0
;
}
}
...
@@ -1117,7 +1114,7 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
...
@@ -1117,7 +1114,7 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
struct
wm8985_priv
*
wm8985
;
struct
wm8985_priv
*
wm8985
;
int
ret
;
int
ret
;
wm8985
=
kzalloc
(
sizeof
*
wm8985
,
GFP_KERNEL
);
wm8985
=
devm_kzalloc
(
&
i2c
->
dev
,
sizeof
*
wm8985
,
GFP_KERNEL
);
if
(
!
wm8985
)
if
(
!
wm8985
)
return
-
ENOMEM
;
return
-
ENOMEM
;
...
@@ -1126,15 +1123,12 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
...
@@ -1126,15 +1123,12 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
ret
=
snd_soc_register_codec
(
&
i2c
->
dev
,
&
soc_codec_dev_wm8985
,
&
wm8985_dai
,
1
);
&
soc_codec_dev_wm8985
,
&
wm8985_dai
,
1
);
if
(
ret
<
0
)
kfree
(
wm8985
);
return
ret
;
return
ret
;
}
}
static
__devexit
int
wm8985_i2c_remove
(
struct
i2c_client
*
client
)
static
__devexit
int
wm8985_i2c_remove
(
struct
i2c_client
*
client
)
{
{
snd_soc_unregister_codec
(
&
client
->
dev
);
snd_soc_unregister_codec
(
&
client
->
dev
);
kfree
(
i2c_get_clientdata
(
client
));
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment