p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] media: radio: assign wait_for_completion_timeout to appropriately typed var 

wait_for_completion_timeout() returns unsigned long not int. This assigns
the return value to an appropriately typed variable (also helps keep
static code checkers happy).

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Nicholas Mc Guire 2015-02-05 04:58:48 -03:00 committed by Mauro Carvalho Chehab
parent 80f4944ec2
commit daa939db21
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/radio/radio-wl1273.c
View File

@ -347,6 +347,7 @@ static int wl1273_fm_set_tx_freq(struct wl1273_device *radio, unsigned int freq)
{
struct wl1273_core *core = radio->core;
int r = 0;
unsigned long t;
if (freq < WL1273_BAND_TX_LOW) {
dev_err(radio->dev,
@ -378,11 +379,11 @@ static int wl1273_fm_set_tx_freq(struct wl1273_device *radio, unsigned int freq)
reinit_completion(&radio->busy);
/* wait for the FR IRQ */
r = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(2000));
if (!r)
t = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(2000));
if (!t)
return -ETIMEDOUT;
dev_dbg(radio->dev, "WL1273_CHANL_SET: %d\n", r);
dev_dbg(radio->dev, "WL1273_CHANL_SET: %lu\n", t);
/* Enable the output power */
r = core->write(core, WL1273_POWER_ENB_SET, 1);
@ -392,12 +393,12 @@ static int wl1273_fm_set_tx_freq(struct wl1273_device *radio, unsigned int freq)
reinit_completion(&radio->busy);
/* wait for the POWER_ENB IRQ */
r = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(1000));
if (!r)
t = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(1000));
if (!t)
return -ETIMEDOUT;
radio->tx_frequency = freq;
dev_dbg(radio->dev, "WL1273_POWER_ENB_SET: %d\n", r);
dev_dbg(radio->dev, "WL1273_POWER_ENB_SET: %lu\n", t);
return 0;
}
@ -406,6 +407,7 @@ static int wl1273_fm_set_rx_freq(struct wl1273_device *radio, unsigned int freq)
{
struct wl1273_core *core = radio->core;
int r, f;
unsigned long t;
if (freq < radio->rangelow) {
dev_err(radio->dev,
@ -446,8 +448,8 @@ static int wl1273_fm_set_rx_freq(struct wl1273_device *radio, unsigned int freq)
reinit_completion(&radio->busy);
r = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(2000));
if (!r) {
t = wait_for_completion_timeout(&radio->busy, msecs_to_jiffies(2000));
if (!t) {
dev_err(radio->dev, "%s: TIMEOUT\n", __func__);
return -ETIMEDOUT;
}