From dahdi-commits at lists.digium.com  Mon Nov 16 14:09:45 2020
From: dahdi-commits at lists.digium.com (SVN commits to the DAHDI project)
Date: Mon, 16 Nov 2020 14:09:45 -0600
Subject: [dahdi-commits] dahdi/linux.git branch "next" updated.
Message-ID: <mailman.1.1605585763.22493.dahdi-commits@lists.digium.com>

branch "next" has been updated
       via  5c840cf43838e0690873e73409491c392333b3b8 (commit)
       via  d228a12f1caabdbcf15a757a0999e7da57ba374d (commit)
       via  6d4c748e0470efac90e7dc4538ff3c5da51f0169 (commit)
       via  4df746fe3ffd6678f36b16c9b0750fa552da92e4 (commit)
      from  97e744ad9604bd7611846da0b9c0c328dc80f262 (commit)

Summary of changes:
 drivers/dahdi/Kbuild            |    3 +-
 drivers/dahdi/dahdi-base.c      |   78 ---------------------------------------
 drivers/dahdi/dahdi_transcode.c |   11 ------
 drivers/dahdi/xpp/Kbuild        |    4 +-
 4 files changed, 4 insertions(+), 92 deletions(-)


- Log -----------------------------------------------------------------
commit 5c840cf43838e0690873e73409491c392333b3b8
Author: Shaun Ruffell <sruffell at sruffell.net>
Date:   Mon Nov 16 22:01:24 2020 -0600

    Kbuild: Rename 'hostprogs-y' to 'hostprogs'
    
    Quiets the following warnings that are a result of commit ("kbuild: rename
    hostprogs-y/always to hostprogs/always-y"
    5f2fb52fac15a8a8e10ce020dd532504a8abfc4e) [1]:
    
      scripts/Makefile.lib:8: 'always' is deprecated. Please use 'always-y' instead
      scripts/Makefile.lib:12: 'hostprogs-y' is deprecated. Please use 'hostprogs' instead
    
    [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5f2fb52fac15a8a8e10ce02
    
    Signed-off-by: Shaun Ruffell <sruffell at sruffell.net>

diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 283aff2..c7144b6 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -153,7 +153,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC)	+= dahdi_echocan_hpec.o
 endif
 
 
-hostprogs-y := makefw
+hostprogs := makefw
 
 
 
diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild
index 2965af0..e46a9d7 100644
--- a/drivers/dahdi/xpp/Kbuild
+++ b/drivers/dahdi/xpp/Kbuild
@@ -57,8 +57,8 @@ xpp_verified			= $(foreach file, $(xpp_verifications), $(file).verified)
 FXO_MODES  = $(src)/../fxo_modes.h
 FXO_VERIFY = $(obj)/init_card_2_$(XPP_PROTOCOL_VERSION) -v $(obj)/init_fxo_modes
 
-hostprogs-y			:= print_fxo_modes
-always				:= $(xpp_verified)
+hostprogs			:= print_fxo_modes
+always-y			:= $(xpp_verified)
 print_fxo_modes-objs		:= print_fxo_modes.o
 HOSTCFLAGS_print_fxo_modes.o	+= -include $(FXO_MODES)
 

commit d228a12f1caabdbcf15a757a0999e7da57ba374d
Author: Shaun Ruffell <sruffell at sruffell.net>
Date:   Mon Nov 16 22:01:23 2020 -0600

    vpmadt032: Create .o.cmd file for the shipped object file.
    
    Kernel version 5.8, in commit "modpost: use read_text_file() and
    get_line() for reading text files" [1] made it an error if the .o.cmd
    file is missing. However, this file is not generated for shipped .o
    files.
    
    [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=70f30cfe5b892fcb7f98e7df72ed6ccfe3225628
    
    Signed-off-by: Shaun Ruffell <sruffell at sruffell.net>

diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 855e5bf..283aff2 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -127,6 +127,7 @@ dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o
 
 ifneq ($(DAHDI_ARCH),)
   ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
+    $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
     VPMADT032_LOADER_PRESENT=yes
     dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
     obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER)	+= dahdi_vpmadt032_loader.o

commit 6d4c748e0470efac90e7dc4538ff3c5da51f0169
Author: Shaun Ruffell <sruffell at sruffell.net>
Date:   Mon Nov 16 22:01:22 2020 -0600

    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 <sruffell at sruffell.net>

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 9fb0c79..bb51e9c 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -53,10 +53,6 @@
 #include <linux/ktime.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 <asm/atomic.h>
@@ -4069,14 +4065,6 @@ dahdi_timer_unlocked_ioctl(struct file *file, unsigned int cmd,
 	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 dahdi_fops = {
 	.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 dahdi_fops = {
 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, unsigned int cmd, unsigned long data)
 	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 dahdi_chan_fops = {
 	.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,
diff --git a/drivers/dahdi/dahdi_transcode.c b/drivers/dahdi/dahdi_transcode.c
index a495dcf..6021aac 100644
--- a/drivers/dahdi/dahdi_transcode.c
+++ b/drivers/dahdi/dahdi_transcode.c
@@ -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)
 {
 	int ret;
@@ -427,11 +420,7 @@ static struct file_operations __dahdi_transcode_fops = {
 	.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,

commit 4df746fe3ffd6678f36b16c9b0750fa552da92e4
Author: Shaun Ruffell <sruffell at sruffell.net>
Date:   Mon Nov 16 22:01:21 2020 -0600

    Remove support for 32-bit userspace with 64-bit kernel
    
    I am not aware of anyone who tests in this configuration, and I'm not
    sure if it currently works. I'll remove any support for the time being
    and can add it back in if someone comes forward needing support for it.
    
    Signed-off-by: Shaun Ruffell <sruffell at sruffell.net>

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

-----------------------------------------------------------------------


-- 
dahdi/linux.git