V4L/DVB (8809): gspca: Revert commit 9a9335776548d01525141c6e8f0c12e86bbde982

the previous patch (sensor upside down).

Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 12 insertions, 25 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 0b292ca0c080..bffddf527759 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -851,8 +851,6 @@ static int vidioc_querycap(struct file *file, void  *priv,
         cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
                           | V4L2_CAP_STREAMING
                           | V4L2_CAP_READWRITE;
-        if (gspca_dev->flags & GSPCA_SENSOR_UPSIDE_DOWN_FLAG)
-                cap->capabilities |= V4L2_CAP_SENSOR_UPSIDE_DOWN;
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 1920c99d6f4a..2596568e82fd 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -118,9 +118,6 @@ struct gspca_frame {
         struct v4l2_buffer v4l2_buf;
 };
 
-/* defines for the flags member */
-#define GSPCA_SENSOR_UPSIDE_DOWN_FLAG 0x01
-
 struct gspca_dev {
         struct video_device vdev;       /* !! must be the first item */
         struct file_operations fops;
@@ -166,7 +163,6 @@ struct gspca_dev {
         char nurbs;                     /* number of allocated URBs */
         char memory;                    /* memory type (V4L2_MEMORY_xxx) */
         __u8 nbalt;                     /* number of USB alternate settings */
-        __u8 flags;                     /* see GSPCA_XXX_FLAG defines */
 };
 
 int gspca_dev_probe(struct usb_interface *intf,
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index f1d8c7a08ba2..79436f27cd4e 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -70,10 +70,6 @@ struct sd {
         unsigned short chip_revision;
 };
 
-#define DRIVER_INFO(sensor, flags) .driver_info = ((sensor) << 8) | (flags)
-#define DRIVER_INFO_GET_SENSOR(driver_info) ((driver_info) >> 8)
-#define DRIVER_INFO_GET_FLAGS(driver_info)  ((driver_info) & 0xff)
-
 /* V4L2 controls supported by the driver */
 static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
@@ -7019,8 +7015,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
         /* define some sensors from the vendor/product */
         sd->sharpness = 2;
-        sd->sensor = DRIVER_INFO_GET_SENSOR(id->driver_info);
-        gspca_dev->flags = DRIVER_INFO_GET_FLAGS(id->driver_info);
+        sd->sensor = id->driver_info;
         sensor = zcxx_probeSensor(gspca_dev);
         if (sensor >= 0)
                 PDEBUG(D_PROBE, "probe sensor -> %02x", sensor);
@@ -7510,19 +7505,19 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x041e, 0x041e)},
 #ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x041e, 0x4017)},
-        {USB_DEVICE(0x041e, 0x401c), DRIVER_INFO(SENSOR_PAS106, 0)},
+        {USB_DEVICE(0x041e, 0x401c), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x041e, 0x401e)},
         {USB_DEVICE(0x041e, 0x401f)},
 #endif
         {USB_DEVICE(0x041e, 0x4029)},
 #ifndef CONFIG_USB_ZC0301
-        {USB_DEVICE(0x041e, 0x4034), DRIVER_INFO(SENSOR_PAS106, 0)},
-        {USB_DEVICE(0x041e, 0x4035), DRIVER_INFO(SENSOR_PAS106, 0)},
+        {USB_DEVICE(0x041e, 0x4034), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x041e, 0x4035), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x041e, 0x4036)},
         {USB_DEVICE(0x041e, 0x403a)},
 #endif
-        {USB_DEVICE(0x041e, 0x4051), DRIVER_INFO(SENSOR_TAS5130C_VF0250, 0)},
-        {USB_DEVICE(0x041e, 0x4053), DRIVER_INFO(SENSOR_TAS5130C_VF0250, 0)},
+        {USB_DEVICE(0x041e, 0x4051), .driver_info = SENSOR_TAS5130C_VF0250},
+        {USB_DEVICE(0x041e, 0x4053), .driver_info = SENSOR_TAS5130C_VF0250},
 #ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x0458, 0x7007)},
         {USB_DEVICE(0x0458, 0x700c)},
@@ -7548,13 +7543,11 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x046d, 0x08d9)},
         {USB_DEVICE(0x046d, 0x08d8)},
         {USB_DEVICE(0x046d, 0x08da)},
-        {USB_DEVICE(0x046d, 0x08dd), DRIVER_INFO(SENSOR_MC501CB, 0)},
-        {USB_DEVICE(0x0471, 0x0325), DRIVER_INFO(SENSOR_PAS106,
-                GSPCA_SENSOR_UPSIDE_DOWN_FLAG)},
-        {USB_DEVICE(0x0471, 0x0326), DRIVER_INFO(SENSOR_PAS106,
-                GSPCA_SENSOR_UPSIDE_DOWN_FLAG)},
-        {USB_DEVICE(0x0471, 0x032d), DRIVER_INFO(SENSOR_PAS106, 0)},
-        {USB_DEVICE(0x0471, 0x032e), DRIVER_INFO(SENSOR_PAS106, 0)},
+        {USB_DEVICE(0x046d, 0x08dd), .driver_info = SENSOR_MC501CB},
+        {USB_DEVICE(0x0471, 0x0325), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x0326), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x032d), .driver_info = SENSOR_PAS106},
+        {USB_DEVICE(0x0471, 0x032e), .driver_info = SENSOR_PAS106},
         {USB_DEVICE(0x055f, 0xc005)},
 #ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x055f, 0xd003)},
@@ -7566,7 +7559,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0ac8, 0x301b)},
         {USB_DEVICE(0x0ac8, 0x303b)},
 #endif
-        {USB_DEVICE(0x0ac8, 0x305b), DRIVER_INFO(SENSOR_TAS5130C_VF0250, 0)},
+        {USB_DEVICE(0x0ac8, 0x305b), .driver_info = SENSOR_TAS5130C_VF0250},
 #ifndef CONFIG_USB_ZC0301
         {USB_DEVICE(0x0ac8, 0x307b)},
         {USB_DEVICE(0x10fd, 0x0128)},