diff options
Diffstat (limited to 'drivers/media/radio')
-rw-r--r-- | drivers/media/radio/radio-shark.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/radio-shark2.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/radio-si476x.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/radio-tea5764.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/tef6862.c | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c index 3db8a8cfe1a8..050b3bb96fec 100644 --- a/drivers/media/radio/radio-shark.c +++ b/drivers/media/radio/radio-shark.c | |||
@@ -271,8 +271,7 @@ static void shark_unregister_leds(struct shark_device *shark) | |||
271 | cancel_work_sync(&shark->led_work); | 271 | cancel_work_sync(&shark->led_work); |
272 | } | 272 | } |
273 | 273 | ||
274 | #ifdef CONFIG_PM | 274 | static inline void shark_resume_leds(struct shark_device *shark) |
275 | static void shark_resume_leds(struct shark_device *shark) | ||
276 | { | 275 | { |
277 | if (test_bit(BLUE_IS_PULSE, &shark->brightness_new)) | 276 | if (test_bit(BLUE_IS_PULSE, &shark->brightness_new)) |
278 | set_bit(BLUE_PULSE_LED, &shark->brightness_new); | 277 | set_bit(BLUE_PULSE_LED, &shark->brightness_new); |
@@ -281,7 +280,6 @@ static void shark_resume_leds(struct shark_device *shark) | |||
281 | set_bit(RED_LED, &shark->brightness_new); | 280 | set_bit(RED_LED, &shark->brightness_new); |
282 | schedule_work(&shark->led_work); | 281 | schedule_work(&shark->led_work); |
283 | } | 282 | } |
284 | #endif | ||
285 | #else | 283 | #else |
286 | static int shark_register_leds(struct shark_device *shark, struct device *dev) | 284 | static int shark_register_leds(struct shark_device *shark, struct device *dev) |
287 | { | 285 | { |
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) | |||
237 | cancel_work_sync(&shark->led_work); | 237 | cancel_work_sync(&shark->led_work); |
238 | } | 238 | } |
239 | 239 | ||
240 | #ifdef CONFIG_PM | 240 | static inline void shark_resume_leds(struct shark_device *shark) |
241 | static void shark_resume_leds(struct shark_device *shark) | ||
242 | { | 241 | { |
243 | int i; | 242 | int i; |
244 | 243 | ||
@@ -247,7 +246,6 @@ static void shark_resume_leds(struct shark_device *shark) | |||
247 | 246 | ||
248 | schedule_work(&shark->led_work); | 247 | schedule_work(&shark->led_work); |
249 | } | 248 | } |
250 | #endif | ||
251 | #else | 249 | #else |
252 | static int shark_register_leds(struct shark_device *shark, struct device *dev) | 250 | static int shark_register_leds(struct shark_device *shark, struct device *dev) |
253 | { | 251 | { |
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c index 9c9084cb99f7..2fd9009f8663 100644 --- a/drivers/media/radio/radio-si476x.c +++ b/drivers/media/radio/radio-si476x.c | |||
@@ -268,8 +268,8 @@ struct si476x_radio; | |||
268 | * | 268 | * |
269 | * @tune_freq: Tune chip to a specific frequency | 269 | * @tune_freq: Tune chip to a specific frequency |
270 | * @seek_start: Star station seeking | 270 | * @seek_start: Star station seeking |
271 | * @rsq_status: Get Recieved Signal Quality(RSQ) status | 271 | * @rsq_status: Get Received Signal Quality(RSQ) status |
272 | * @rds_blckcnt: Get recived RDS blocks count | 272 | * @rds_blckcnt: Get received RDS blocks count |
273 | * @phase_diversity: Change phase diversity mode of the tuner | 273 | * @phase_diversity: Change phase diversity mode of the tuner |
274 | * @phase_div_status: Get phase diversity mode status | 274 | * @phase_div_status: Get phase diversity mode status |
275 | * @acf_status: Get the status of Automatically Controlled | 275 | * @acf_status: Get the status of Automatically Controlled |
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c index 036e2f54f4db..3ed1f5669f79 100644 --- a/drivers/media/radio/radio-tea5764.c +++ b/drivers/media/radio/radio-tea5764.c | |||
@@ -356,7 +356,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, | |||
356 | So we keep it as-is. */ | 356 | So we keep it as-is. */ |
357 | return -EINVAL; | 357 | return -EINVAL; |
358 | } | 358 | } |
359 | clamp(freq, FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL); | 359 | freq = clamp(freq, FREQ_MIN * FREQ_MUL, FREQ_MAX * FREQ_MUL); |
360 | tea5764_power_up(radio); | 360 | tea5764_power_up(radio); |
361 | tea5764_tune(radio, (freq * 125) / 2); | 361 | tea5764_tune(radio, (freq * 125) / 2); |
362 | return 0; | 362 | return 0; |
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c index 69e3245a58a0..a9319a24c7ef 100644 --- a/drivers/media/radio/tef6862.c +++ b/drivers/media/radio/tef6862.c | |||
@@ -112,7 +112,7 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequen | |||
112 | if (f->tuner != 0) | 112 | if (f->tuner != 0) |
113 | return -EINVAL; | 113 | return -EINVAL; |
114 | 114 | ||
115 | clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ); | 115 | freq = clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ); |
116 | pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL; | 116 | pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL; |
117 | i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM; | 117 | i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM; |
118 | i2cmsg[1] = (pll >> 8) & 0xff; | 118 | i2cmsg[1] = (pll >> 8) & 0xff; |