diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
| commit | fbd22402164e687fd1be9a1372ee4f6b9373c860 (patch) | |
| tree | fd86c8b2f8ed120a2229a1de7959f0d4e56c8008 /drivers/media/radio/radio-shark2.c | |
| parent | PM / Sleep: Add macro to define common late/early system PM callbacks (diff) | |
| parent | PM / sleep: Fix memory leak in pm_vt_switch_unregister(). (diff) | |
| download | linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.tar.xz linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.zip | |
Merge back earlier 'pm-sleep' material.
Diffstat (limited to 'drivers/media/radio/radio-shark2.c')
| -rw-r--r-- | drivers/media/radio/radio-shark2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c index d86d90dab8bf..8654e0dc5c95 100644 --- a/drivers/media/radio/radio-shark2.c +++ b/drivers/media/radio/radio-shark2.c @@ -237,8 +237,7 @@ static void shark_unregister_leds(struct shark_device *shark) cancel_work_sync(&shark->led_work); } -#ifdef CONFIG_PM -static void shark_resume_leds(struct shark_device *shark) +static inline void shark_resume_leds(struct shark_device *shark) { int i; @@ -247,7 +246,6 @@ static void shark_resume_leds(struct shark_device *shark) schedule_work(&shark->led_work); } -#endif #else static int shark_register_leds(struct shark_device *shark, struct device *dev) { |