Skip to content

Commit

Permalink
V4L/DVB: radio-si470x: use unlocked ioctl
Browse files Browse the repository at this point in the history 
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Oct 21, 2010
1 parent cf9b475 commit f2f8e85
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
27 changes: 22 additions & 5 deletions drivers/media/radio/si470x/radio-si470x-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,17 +408,15 @@ int si470x_stop(struct si470x_device *radio)
/*
* si470x_rds_on - switch on rds reception
*/
int si470x_rds_on(struct si470x_device *radio)
static int si470x_rds_on(struct si470x_device *radio)
{
int retval;

/* sysconfig 1 */
mutex_lock(&radio->lock);
radio->registers[SYSCONFIG1] |= SYSCONFIG1_RDS;
retval = si470x_set_register(radio, SYSCONFIG1);
if (retval < 0)
radio->registers[SYSCONFIG1] &= ~SYSCONFIG1_RDS;
mutex_unlock(&radio->lock);

return retval;
}
Expand All @@ -440,6 +438,7 @@ static ssize_t si470x_fops_read(struct file *file, char __user *buf,
unsigned int block_count = 0;

/* switch on rds reception */
mutex_lock(&radio->lock);
if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
si470x_rds_on(radio);

Expand Down Expand Up @@ -480,9 +479,9 @@ static ssize_t si470x_fops_read(struct file *file, char __user *buf,
buf += 3;
retval += 3;
}
mutex_unlock(&radio->lock);

done:
mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -497,8 +496,11 @@ static unsigned int si470x_fops_poll(struct file *file,
int retval = 0;

/* switch on rds reception */

mutex_lock(&radio->lock);
if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
si470x_rds_on(radio);
mutex_unlock(&radio->lock);

poll_wait(file, &radio->read_queue, pts);

Expand All @@ -516,7 +518,7 @@ static const struct v4l2_file_operations si470x_fops = {
.owner = THIS_MODULE,
.read = si470x_fops_read,
.poll = si470x_fops_poll,
.ioctl = video_ioctl2,
.unlocked_ioctl = video_ioctl2,
.open = si470x_fops_open,
.release = si470x_fops_release,
};
Expand Down Expand Up @@ -572,6 +574,7 @@ static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand All @@ -594,6 +597,8 @@ static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"get control failed with %d\n", retval);

mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -607,6 +612,7 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand All @@ -633,6 +639,7 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"set control failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand Down Expand Up @@ -662,6 +669,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand Down Expand Up @@ -737,6 +745,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"get tuner failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -750,6 +759,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand All @@ -776,6 +786,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"set tuner failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -790,6 +801,7 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
int retval = 0;

/* safety checks */
mutex_lock(&radio->lock);
retval = si470x_disconnect_check(radio);
if (retval)
goto done;
Expand All @@ -806,6 +818,7 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"get frequency failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -819,6 +832,7 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand All @@ -835,6 +849,7 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"set frequency failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand All @@ -848,6 +863,7 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
struct si470x_device *radio = video_drvdata(file);
int retval = 0;

mutex_lock(&radio->lock);
/* safety checks */
retval = si470x_disconnect_check(radio);
if (retval)
Expand All @@ -864,6 +880,7 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
if (retval < 0)
dev_warn(&radio->videodev->dev,
"set hardware frequency seek failed with %d\n", retval);
mutex_unlock(&radio->lock);
return retval;
}

Expand Down
1 change: 0 additions & 1 deletion drivers/media/radio/si470x/radio-si470x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ int si470x_disconnect_check(struct si470x_device *radio);
int si470x_set_freq(struct si470x_device *radio, unsigned int freq);
int si470x_start(struct si470x_device *radio);
int si470x_stop(struct si470x_device *radio);
int si470x_rds_on(struct si470x_device *radio);
int si470x_fops_open(struct file *file);
int si470x_fops_release(struct file *file);
int si470x_vidioc_querycap(struct file *file, void *priv,
Expand Down

0 comments on commit f2f8e85

Please sign in to comment.