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
d99903ca
Commit
d99903ca
authored
Oct 06, 2014
by
Ulf Hansson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mmc: core: Remove superfluous ifdefs for SDIO bus' PM callbacks
Signed-off-by:
Ulf Hansson
<
ulf.hansson@linaro.org
>
parent
20d5a703
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
drivers/mmc/core/sdio_bus.c
drivers/mmc/core/sdio_bus.c
+1
-11
No files found.
drivers/mmc/core/sdio_bus.c
View file @
d99903ca
...
@@ -196,8 +196,6 @@ static int sdio_bus_remove(struct device *dev)
...
@@ -196,8 +196,6 @@ static int sdio_bus_remove(struct device *dev)
return
ret
;
return
ret
;
}
}
#ifdef CONFIG_PM
static
const
struct
dev_pm_ops
sdio_bus_pm_ops
=
{
static
const
struct
dev_pm_ops
sdio_bus_pm_ops
=
{
SET_SYSTEM_SLEEP_PM_OPS
(
pm_generic_suspend
,
pm_generic_resume
)
SET_SYSTEM_SLEEP_PM_OPS
(
pm_generic_suspend
,
pm_generic_resume
)
SET_RUNTIME_PM_OPS
(
SET_RUNTIME_PM_OPS
(
...
@@ -207,14 +205,6 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
...
@@ -207,14 +205,6 @@ static const struct dev_pm_ops sdio_bus_pm_ops = {
)
)
};
};
#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops)
#else
/* !CONFIG_PM */
#define SDIO_PM_OPS_PTR NULL
#endif
/* !CONFIG_PM */
static
struct
bus_type
sdio_bus_type
=
{
static
struct
bus_type
sdio_bus_type
=
{
.
name
=
"sdio"
,
.
name
=
"sdio"
,
.
dev_groups
=
sdio_dev_groups
,
.
dev_groups
=
sdio_dev_groups
,
...
@@ -222,7 +212,7 @@ static struct bus_type sdio_bus_type = {
...
@@ -222,7 +212,7 @@ static struct bus_type sdio_bus_type = {
.
uevent
=
sdio_bus_uevent
,
.
uevent
=
sdio_bus_uevent
,
.
probe
=
sdio_bus_probe
,
.
probe
=
sdio_bus_probe
,
.
remove
=
sdio_bus_remove
,
.
remove
=
sdio_bus_remove
,
.
pm
=
SDIO_PM_OPS_PTR
,
.
pm
=
&
sdio_bus_pm_ops
,
};
};
int
sdio_register_bus
(
void
)
int
sdio_register_bus
(
void
)
...
...
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