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
Kirill Smelkov
linux
Commits
d57a79ac
Commit
d57a79ac
authored
Jul 10, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: pcm3008: Convert to devm_gpio_request_one()
Signed-off-by:
Mark Brown
<
broonie@linaro.org
>
parent
33319a2f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
32 deletions
+12
-32
sound/soc/codecs/pcm3008.c
sound/soc/codecs/pcm3008.c
+12
-32
No files found.
sound/soc/codecs/pcm3008.c
View file @
d57a79ac
...
...
@@ -49,14 +49,6 @@ static struct snd_soc_dai_driver pcm3008_dai = {
},
};
static
void
pcm3008_gpio_free
(
struct
pcm3008_setup_data
*
setup
)
{
gpio_free
(
setup
->
dem0_pin
);
gpio_free
(
setup
->
dem1_pin
);
gpio_free
(
setup
->
pdad_pin
);
gpio_free
(
setup
->
pdda_pin
);
}
#ifdef CONFIG_PM
static
int
pcm3008_soc_suspend
(
struct
snd_soc_codec
*
codec
)
{
...
...
@@ -103,49 +95,37 @@ static int pcm3008_codec_probe(struct platform_device *pdev)
*/
/* Configure DEM0 GPIO (turning OFF DAC De-emphasis). */
ret
=
gpio_request
(
setup
->
dem0_pin
,
"codec_dem0"
);
if
(
ret
==
0
)
ret
=
gpio_direction_output
(
setup
->
dem0_pin
,
1
);
ret
=
devm_gpio_request_one
(
&
pdev
->
dev
,
setup
->
dem0_pin
,
GPIOF_OUT_INIT_HIGH
,
"codec_dem0"
);
if
(
ret
!=
0
)
goto
gpio_err
;
return
ret
;
/* Configure DEM1 GPIO (turning OFF DAC De-emphasis). */
ret
=
gpio_request
(
setup
->
dem1_pin
,
"codec_dem1"
);
if
(
ret
==
0
)
ret
=
gpio_direction_output
(
setup
->
dem1_pin
,
0
);
ret
=
devm_gpio_request_one
(
&
pdev
->
dev
,
setup
->
dem1_pin
,
GPIOF_OUT_INIT_LOW
,
"codec_dem1"
);
if
(
ret
!=
0
)
goto
gpio_err
;
return
ret
;
/* Configure PDAD GPIO. */
ret
=
gpio_request
(
setup
->
pdad_pin
,
"codec_pdad"
);
if
(
ret
==
0
)
ret
=
gpio_direction_output
(
setup
->
pdad_pin
,
1
);
ret
=
devm_gpio_request_one
(
&
pdev
->
dev
,
setup
->
pdad_pin
,
GPIOF_OUT_INIT_HIGH
,
"codec_pdad"
);
if
(
ret
!=
0
)
goto
gpio_err
;
return
ret
;
/* Configure PDDA GPIO. */
ret
=
gpio_request
(
setup
->
pdda_pin
,
"codec_pdda"
);
if
(
ret
==
0
)
ret
=
gpio_direction_output
(
setup
->
pdda_pin
,
1
);
ret
=
devm_gpio_request_one
(
&
pdev
->
dev
,
setup
->
pdda_pin
,
GPIOF_OUT_INIT_HIGH
,
"codec_pdda"
);
if
(
ret
!=
0
)
goto
gpio_err
;
return
ret
;
return
snd_soc_register_codec
(
&
pdev
->
dev
,
&
soc_codec_dev_pcm3008
,
&
pcm3008_dai
,
1
);
gpio_err:
pcm3008_gpio_free
(
setup
);
return
ret
;
}
static
int
pcm3008_codec_remove
(
struct
platform_device
*
pdev
)
{
struct
pcm3008_setup_data
*
setup
=
pdev
->
dev
.
platform_data
;
snd_soc_unregister_codec
(
&
pdev
->
dev
);
pcm3008_gpio_free
(
setup
);
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