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 4499dfe2b70601e349eb9ae7eb9cb85d0b251b62..5a9a00d9e6469f94e7143a51cf247f2b8ee87601 100644 (file)
--- 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 6a51227664c49b5461bd17baed64df147f605baf..43bf20639c341ce3530a73d828b52e11a61b4f12 100644 (file)
--- 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 e177789623126cb7a5d83ae8888b1858fc0bfce9..564956d6dd74151ec1bcdcadc82dfa55e3dc690d 100644 (file)
--- 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;