From: Christian Hoffmann <chrmhoffmann@gmail.com>
Date: Sat, 4 Feb 2023 18:41:04 +0000 (+0100)
Subject: Revert "dvb: add 32/64 bits compatibility support"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78ddceac7dd8ac13f0a58a4e6f5453961cec9ba3;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Revert "dvb: add 32/64 bits compatibility support"

This partially reverts commit 7b663ab7ed43e81d9017b770eaa7b3b2fcc1b629.

Change-Id: If809d096901809b2a67b34cea3c0cef7657d01e7
---

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 5a9a00d9e646..ce6d9cbee3b8 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1222,18 +1222,6 @@ static int dvb_demux_release(struct inode *inode, struct file *file)
 	return ret;
 }
 
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-static long dvb_demux_compat_ioctl(struct file *filp,
-			unsigned int cmd, unsigned long args)
-{
-	unsigned long ret;
-
-	args = (unsigned long)compat_ptr(args);
-	ret = dvb_demux_ioctl(filp, cmd, args);
-	return ret;
-}
-#endif
-
 static const struct file_operations dvb_demux_fops = {
 	.owner = THIS_MODULE,
 	.read = dvb_demux_read,
@@ -1242,9 +1230,6 @@ static const struct file_operations dvb_demux_fops = {
 	.release = dvb_demux_release,
 	.poll = dvb_demux_poll,
 	.llseek = default_llseek,
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-	.compat_ioctl	= dvb_demux_compat_ioctl,
-#endif
 };
 
 static const struct dvb_device dvbdev_demux = {
@@ -1328,18 +1313,6 @@ static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)
 	return mask;
 }
 
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-static long dvb_dvr_compat_ioctl(struct file *filp,
-			unsigned int cmd, unsigned long args)
-{
-	unsigned long ret;
-
-	args = (unsigned long)compat_ptr(args);
-	ret = dvb_dvr_ioctl(filp, cmd, args);
-	return ret;
-}
-#endif
-
 static const struct file_operations dvb_dvr_fops = {
 	.owner = THIS_MODULE,
 	.read = dvb_dvr_read,
@@ -1349,9 +1322,6 @@ static const struct file_operations dvb_dvr_fops = {
 	.release = dvb_dvr_release,
 	.poll = dvb_dvr_poll,
 	.llseek = default_llseek,
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-	.compat_ioctl	= dvb_dvr_compat_ioctl,
-#endif
 };
 
 static const struct dvb_device dvbdev_dvr = {
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 43bf20639c34..42ce88ceac66 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1683,17 +1683,6 @@ static unsigned int dvb_ca_en50221_io_poll(struct file *file, poll_table * wait)
 }
 EXPORT_SYMBOL(dvb_ca_en50221_init);
 
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-static long dvb_ca_en50221_compat_ioctl(struct file *filp,
-			unsigned int cmd, unsigned long args)
-{
-	unsigned long ret;
-
-	args = (unsigned long)compat_ptr(args);
-	ret = dvb_ca_en50221_io_ioctl(filp, cmd, args);
-	return ret;
-}
-#endif
 
 static const struct file_operations dvb_ca_fops = {
 	.owner = THIS_MODULE,
@@ -1704,9 +1693,6 @@ static const struct file_operations dvb_ca_fops = {
 	.release = dvb_ca_en50221_io_release,
 	.poll = dvb_ca_en50221_io_poll,
 	.llseek = noop_llseek,
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-	.compat_ioctl	= dvb_ca_en50221_compat_ioctl,
-#endif
 };
 
 static const struct dvb_device dvbdev_ca = {
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 564956d6dd74..ebe1307fd5b2 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2661,30 +2661,6 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
 	return ret;
 }
 
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-static long dvb_frontend_compat_ioctl(struct file *filp,
-			unsigned int cmd, unsigned long args)
-{
-	unsigned long ret;
-	struct dtv_properties tvps;
-
-	args  = (unsigned long)compat_ptr(args);
-
-	if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY)) {
-		if (copy_from_user(&tvps, (void *)args,
-			sizeof(struct dtv_properties)))
-			return -EFAULT;
-		tvps.props = compat_ptr((unsigned long)tvps.props);
-		if (copy_to_user((void *)args, (void *)&tvps,
-			sizeof(struct dtv_properties)))
-			return -EFAULT;
-	}
-
-	ret = dvb_generic_ioctl(filp, cmd, args);
-	return ret;
-}
-#endif
-
 static const struct file_operations dvb_frontend_fops = {
 	.owner		= THIS_MODULE,
 	.unlocked_ioctl	= dvb_generic_ioctl,
@@ -2692,9 +2668,6 @@ static const struct file_operations dvb_frontend_fops = {
 	.open		= dvb_frontend_open,
 	.release	= dvb_frontend_release,
 	.llseek		= noop_llseek,
-#ifdef CONFIG_AMLOGIC_DVB_COMPAT
-	.compat_ioctl	= dvb_frontend_compat_ioctl,
-#endif
 };
 
 int dvb_frontend_suspend(struct dvb_frontend *fe)