From 6d4c748e0470efac90e7dc4538ff3c5da51f0169 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 16 Nov 2020 22:01:22 -0600 Subject: [PATCH 10/12] Remove checks for HAVE_UNLOCKED_IOCTL for kernel >= 5.9 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 --- drivers/dahdi/dahdi-base.c | 44 --------------------------------- drivers/dahdi/dahdi_transcode.c | 11 --------- 2 files changed, 55 deletions(-) --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -53,10 +53,6 @@ #include #include -#if defined(HAVE_UNLOCKED_IOCTL) && defined(CONFIG_BKL) -#include -#endif - #include #include @@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file * 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) { int res = 0; @@ -7011,14 +6999,6 @@ exit: 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. * @span: The span with which to start the search. @@ -10272,11 +10252,7 @@ static const struct file_operations dahd .owner = THIS_MODULE, .open = dahdi_open, .release = dahdi_release, -#ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_unlocked_ioctl, -#else - .ioctl = dahdi_ioctl, -#endif .poll = dahdi_poll, .read = dahdi_no_read, .write = dahdi_no_write, @@ -10285,11 +10261,7 @@ static const struct file_operations dahd static const struct file_operations dahdi_timer_fops = { .owner = THIS_MODULE, .release = dahdi_timer_release, -#ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_timer_unlocked_ioctl, -#else - .ioctl = dahdi_timer_ioctl, -#endif .poll = dahdi_timer_poll, .read = dahdi_no_read, .write = dahdi_no_write, @@ -10352,21 +10324,9 @@ nodev_unlocked_ioctl(struct file *file, 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 = { .owner = THIS_MODULE, -#ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = nodev_unlocked_ioctl, -#else - .ioctl = nodev_ioctl, -#endif .read = nodev_chan_read, .write = nodev_chan_write, .poll = nodev_chan_poll, @@ -10376,11 +10336,7 @@ static const struct file_operations dahd .owner = THIS_MODULE, .open = dahdi_open, .release = dahdi_release, -#ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_unlocked_ioctl, -#else - .ioctl = dahdi_ioctl, -#endif .read = dahdi_chan_read, .write = dahdi_chan_write, .poll = dahdi_chan_poll, --- a/drivers/dahdi/dahdi_transcode.c +++ b/drivers/dahdi/dahdi_transcode.c @@ -397,13 +397,6 @@ static long dahdi_tc_unlocked_ioctl(stru }; } -#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) { int ret; @@ -427,11 +420,7 @@ static struct file_operations __dahdi_tr .owner = THIS_MODULE, .open = dahdi_tc_open, .release = dahdi_tc_release, -#ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_tc_unlocked_ioctl, -#else - .ioctl = dahdi_tc_ioctl, -#endif .read = dahdi_tc_read, .write = dahdi_tc_write, .poll = dahdi_tc_poll,