diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 4fb06d9..9fb0c79 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -7019,17 +7019,6 @@ static int dahdi_ioctl(struct inode *inode, struct file *file, } #endif -#ifdef HAVE_COMPAT_IOCTL -static long dahdi_ioctl_compat(struct file *file, unsigned int cmd, - unsigned long data) -{ - if (cmd == DAHDI_SFCONFIG) - return -ENOTTY; /* Not supported yet */ - - 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. @@ -10285,9 +10274,6 @@ static const struct file_operations dahdi_fops = { .release = dahdi_release, #ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_unlocked_ioctl, -#ifdef HAVE_COMPAT_IOCTL - .compat_ioctl = dahdi_ioctl_compat, -#endif #else .ioctl = dahdi_ioctl, #endif @@ -10301,9 +10287,6 @@ static const struct file_operations dahdi_timer_fops = { .release = dahdi_timer_release, #ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_timer_unlocked_ioctl, -#ifdef HAVE_COMPAT_IOCTL - .compat_ioctl = dahdi_timer_unlocked_ioctl, -#endif #else .ioctl = dahdi_timer_ioctl, #endif @@ -10377,24 +10360,10 @@ static int nodev_ioctl(struct inode *inode, struct file *file, } #endif -#ifdef HAVE_COMPAT_IOCTL -static long nodev_ioctl_compat(struct file *file, unsigned int cmd, - unsigned long data) -{ - if (cmd == DAHDI_SFCONFIG) - return -ENOTTY; /* Not supported yet */ - - 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, -#ifdef HAVE_COMPAT_IOCTL - .compat_ioctl = nodev_ioctl_compat, -#endif #else .ioctl = nodev_ioctl, #endif @@ -10409,9 +10378,6 @@ static const struct file_operations dahdi_chan_fops = { .release = dahdi_release, #ifdef HAVE_UNLOCKED_IOCTL .unlocked_ioctl = dahdi_unlocked_ioctl, -#ifdef HAVE_COMPAT_IOCTL - .compat_ioctl = dahdi_ioctl_compat, -#endif #else .ioctl = dahdi_ioctl, #endif