media: dvb_frontend: Add unlocked_ioctl in dvb_frontend.c
Adds unlocked ioctl function directly in dvb_frontend.c instead of using dvb_generic_ioctl(). Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
6cdeaed3b1
commit
a2282fd1fe
|
@ -1922,7 +1922,8 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dvb_frontend_ioctl(struct file *file, unsigned int cmd, void *parg)
|
static int dvb_frontend_do_ioctl(struct file *file, unsigned int cmd,
|
||||||
|
void *parg)
|
||||||
{
|
{
|
||||||
struct dvb_device *dvbdev = file->private_data;
|
struct dvb_device *dvbdev = file->private_data;
|
||||||
struct dvb_frontend *fe = dvbdev->priv;
|
struct dvb_frontend *fe = dvbdev->priv;
|
||||||
|
@ -1965,6 +1966,17 @@ static int dvb_frontend_ioctl(struct file *file, unsigned int cmd, void *parg)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static long dvb_frontend_ioctl(struct file *file, unsigned int cmd,
|
||||||
|
unsigned long arg)
|
||||||
|
{
|
||||||
|
struct dvb_device *dvbdev = file->private_data;
|
||||||
|
|
||||||
|
if (!dvbdev)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
return dvb_usercopy(file, cmd, arg, dvb_frontend_do_ioctl);
|
||||||
|
}
|
||||||
|
|
||||||
static int dtv_set_frontend(struct dvb_frontend *fe)
|
static int dtv_set_frontend(struct dvb_frontend *fe)
|
||||||
{
|
{
|
||||||
struct dvb_frontend_private *fepriv = fe->frontend_priv;
|
struct dvb_frontend_private *fepriv = fe->frontend_priv;
|
||||||
|
@ -2648,7 +2660,7 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
|
||||||
|
|
||||||
static const struct file_operations dvb_frontend_fops = {
|
static const struct file_operations dvb_frontend_fops = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.unlocked_ioctl = dvb_generic_ioctl,
|
.unlocked_ioctl = dvb_frontend_ioctl,
|
||||||
.poll = dvb_frontend_poll,
|
.poll = dvb_frontend_poll,
|
||||||
.open = dvb_frontend_open,
|
.open = dvb_frontend_open,
|
||||||
.release = dvb_frontend_release,
|
.release = dvb_frontend_release,
|
||||||
|
@ -2716,7 +2728,6 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
|
||||||
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
|
#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
|
||||||
.name = fe->ops.info.name,
|
.name = fe->ops.info.name,
|
||||||
#endif
|
#endif
|
||||||
.kernel_ioctl = dvb_frontend_ioctl
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dev_dbg(dvb->device, "%s:\n", __func__);
|
dev_dbg(dvb->device, "%s:\n", __func__);
|
||||||
|
|
Loading…
Reference in New Issue