FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove checks for HAVE_UNLOCKED_IOCTL for kernel >= 5.9

Browse Source 
In upstream commit (4e24566a134ea1674 "fs: remove the HAVE_UNLOCKED_IOCTL and
HAVE_COMPAT_IOCTL defines") [1] the kernel removed these defines.

All supported kernels include support for the unlocked_ioctl now, so
DAHDI can also remove these checks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4e24566a134ea167441a1ffa3d439a27c

Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
This commit is contained in:
Shaun Ruffell 2020-11-16 22:01:22 -06:00
parent 4df746fe3f
commit 6d4c748e04
2 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/dahdi/dahdi-base.c
View File

@ -53,10 +53,6 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <linux/slab.h> #include <linux/slab.h>
#if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL)
#include <linux/smp_lock.h>
#endif
#include <linux/ppp_defs.h> #include <linux/ppp_defs.h>
#include <asm/atomic.h> #include <asm/atomic.h>
@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file *file, unsigned int cmd,
return 0; return 0;
} }
#ifndef HAVE_UNLOCKED_IOCTL
static int dahdi_timer_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long data)
{
return dahdi_timer_unlocked_ioctl(file, cmd, data);
}
#endif
static int dahdi_ioctl_getgains(struct file *file, unsigned long data) static int dahdi_ioctl_getgains(struct file *file, unsigned long data)
{ {
int res = 0; int res = 0;
@ -7011,14 +6999,6 @@ exit:
return ret; return ret;
} }
#ifndef HAVE_UNLOCKED_IOCTL
static int dahdi_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long data)
{
return dahdi_unlocked_ioctl(file, cmd, data);
}
#endif
/** /**
* _get_next_channo - Return the next taken channel number from the span list. * _get_next_channo - Return the next taken channel number from the span list.
* @span: The span with which to start the search. * @span: The span with which to start the search.
@ -10272,11 +10252,7 @@ static const struct file_operations dahdi_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = dahdi_open, .open = dahdi_open,
.release = dahdi_release, .release = dahdi_release,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = dahdi_unlocked_ioctl, .unlocked_ioctl = dahdi_unlocked_ioctl,
#else
.ioctl = dahdi_ioctl,
#endif
.poll = dahdi_poll, .poll = dahdi_poll,
.read = dahdi_no_read, .read = dahdi_no_read,
.write = dahdi_no_write, .write = dahdi_no_write,
@ -10285,11 +10261,7 @@ static const struct file_operations dahdi_fops = {
static const struct file_operations dahdi_timer_fops = { static const struct file_operations dahdi_timer_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.release = dahdi_timer_release, .release = dahdi_timer_release,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = dahdi_timer_unlocked_ioctl, .unlocked_ioctl = dahdi_timer_unlocked_ioctl,
#else
.ioctl = dahdi_timer_ioctl,
#endif
.poll = dahdi_timer_poll, .poll = dahdi_timer_poll,
.read = dahdi_no_read, .read = dahdi_no_read,
.write = dahdi_no_write, .write = dahdi_no_write,
@ -10352,21 +10324,9 @@ nodev_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long data)
return nodev_common("ioctl"); return nodev_common("ioctl");
} }
#ifndef HAVE_UNLOCKED_IOCTL
static int nodev_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long data)
{
return nodev_unlocked_ioctl(file, cmd, data);
}
#endif
static const struct file_operations nodev_fops = { static const struct file_operations nodev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = nodev_unlocked_ioctl, .unlocked_ioctl = nodev_unlocked_ioctl,
#else
.ioctl = nodev_ioctl,
#endif
.read = nodev_chan_read, .read = nodev_chan_read,
.write = nodev_chan_write, .write = nodev_chan_write,
.poll = nodev_chan_poll, .poll = nodev_chan_poll,
@ -10376,11 +10336,7 @@ static const struct file_operations dahdi_chan_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = dahdi_open, .open = dahdi_open,
.release = dahdi_release, .release = dahdi_release,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = dahdi_unlocked_ioctl, .unlocked_ioctl = dahdi_unlocked_ioctl,
#else
.ioctl = dahdi_ioctl,
#endif
.read = dahdi_chan_read, .read = dahdi_chan_read,
.write = dahdi_chan_write, .write = dahdi_chan_write,
.poll = dahdi_chan_poll, .poll = dahdi_chan_poll,

11
drivers/dahdi/dahdi_transcode.c
View File

@ -397,13 +397,6 @@ static long dahdi_tc_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
}; };
} }
#ifndef HAVE_UNLOCKED_IOCTL
static int dahdi_tc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
{
return (int)dahdi_tc_unlocked_ioctl(file, cmd, data);
}
#endif
static unsigned int dahdi_tc_poll(struct file *file, struct poll_table_struct *wait_table) static unsigned int dahdi_tc_poll(struct file *file, struct poll_table_struct *wait_table)
{ {
int ret; int ret;
@ -427,11 +420,7 @@ static struct file_operations __dahdi_transcode_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = dahdi_tc_open, .open = dahdi_tc_open,
.release = dahdi_tc_release, .release = dahdi_tc_release,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = dahdi_tc_unlocked_ioctl, .unlocked_ioctl = dahdi_tc_unlocked_ioctl,
#else
.ioctl = dahdi_tc_ioctl,
#endif
.read = dahdi_tc_read, .read = dahdi_tc_read,
.write = dahdi_tc_write, .write = dahdi_tc_write,
.poll = dahdi_tc_poll, .poll = dahdi_tc_poll,