From: Christian Hoffmann <chrmhoffmann@gmail.com>
Date: Sat, 4 Feb 2023 18:27:16 +0000 (+0100)
Subject: Revert "dvb: add configuration items to control dvb module compilation. [1\2]"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5968c4a4afaf20d4d51122c3f8fde56fe38096dd;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Revert "dvb: add configuration items to control dvb module compilation. [1\2]"

This partially reverts commit 37434e0be62710ffd76760e13bd121e4d12cf2d0.

Change-Id: Iaa9bfc0e34923b5c65eca406df7eb538e51575c4
---

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 4499dfe2b706..5a9a00d9e646 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1227,9 +1227,8 @@ static long dvb_demux_compat_ioctl(struct file *filp,
 			unsigned int cmd, unsigned long args)
 {
 	unsigned long ret;
-#ifdef CONFIG_COMPAT
+
 	args = (unsigned long)compat_ptr(args);
-#endif
 	ret = dvb_demux_ioctl(filp, cmd, args);
 	return ret;
 }
@@ -1334,9 +1333,8 @@ static long dvb_dvr_compat_ioctl(struct file *filp,
 			unsigned int cmd, unsigned long args)
 {
 	unsigned long ret;
-#ifdef CONFIG_COMPAT
+
 	args = (unsigned long)compat_ptr(args);
-#endif
 	ret = dvb_dvr_ioctl(filp, cmd, args);
 	return ret;
 }
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index 6a51227664c4..43bf20639c34 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1688,9 +1688,8 @@ static long dvb_ca_en50221_compat_ioctl(struct file *filp,
 			unsigned int cmd, unsigned long args)
 {
 	unsigned long ret;
-#ifdef CONFIG_COMPAT
+
 	args = (unsigned long)compat_ptr(args);
-#endif
 	ret = dvb_ca_en50221_io_ioctl(filp, cmd, args);
 	return ret;
 }
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index e17778962312..564956d6dd74 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2667,16 +2667,14 @@ static long dvb_frontend_compat_ioctl(struct file *filp,
 {
 	unsigned long ret;
 	struct dtv_properties tvps;
-#ifdef CONFIG_COMPAT
+
 	args  = (unsigned long)compat_ptr(args);
-#endif
+
 	if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY)) {
 		if (copy_from_user(&tvps, (void *)args,
 			sizeof(struct dtv_properties)))
 			return -EFAULT;
-#ifdef CONFIG_COMPAT
 		tvps.props = compat_ptr((unsigned long)tvps.props);
-#endif
 		if (copy_to_user((void *)args, (void *)&tvps,
 			sizeof(struct dtv_properties)))
 			return -EFAULT;