Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956e42d2 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG. 



main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505:
	 Cleanup source.
sunplus: Compilation error when VIDEO_ADV_DEBUG set.

Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 00528d9c

drivers/media/video/gspca/gspca.c

+4 −4
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#include <linux/mm.h>

#include <linux/string.h>

#include <linux/pagemap.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/page.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <linux/jiffies.h>



#include "gspca.h"
@@ -45,8 +45,8 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>"); 
MODULE_DESCRIPTION("GSPCA USB Camera Driver");

MODULE_LICENSE("GPL");



#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 0)

static const char version[] = "2.1.0";

#define DRIVER_VERSION_NUMBER	KERNEL_VERSION(2, 1, 1)

static const char version[] = "2.1.1";



static int video_nr = -1;

drivers/media/video/gspca/mars.c

+4 −2
Original line number Diff line number Diff line
@@ -220,13 +220,15 @@ static void sd_start(struct gspca_dev *gspca_dev) 
	if (0) {			/* fixed dark-gain */

		data[1] = 0;		/* reg 94, Y Gain (1.75) */

		data[2] = 0;		/* reg 95, UV Gain (1.75) */

		data[3] = 0x3f;		/* reg 96, Y Gain/UV Gain/disable auto dark-gain */

		data[3] = 0x3f;		/* reg 96, Y Gain/UV Gain/disable

					 *	auto dark-gain */

		data[4] = 0;		/* reg 97, set fixed dark level */

		data[5] = 0;		/* reg 98, don't care */

	} else {			/* auto dark-gain */

		data[1] = 0;		/* reg 94, Y Gain (auto) */

		data[2] = 0;		/* reg 95, UV Gain (1.75) */

		data[3] = 0x78;		/* reg 96, Y Gain/UV Gain/disable auto dark-gain */

		data[3] = 0x78;		/* reg 96, Y Gain/UV Gain/disable

					 *	auto dark-gain */

		switch (gspca_dev->width) {

/*		case 1280: */

/*			data[4] = 154;

drivers/media/video/gspca/pac207.c

+12 −12
Original line number Diff line number Diff line
@@ -452,30 +452,30 @@ static void pac207_do_auto_gain(struct gspca_dev *gspca_dev) 


	for (i = 0; i < steps; i++) {

		if (avg_lum > desired_avg_lum) {

			if (sd->gain > PAC207_GAIN_KNEE) {

			if (sd->gain > PAC207_GAIN_KNEE)

				sd->gain--;

			} else if (sd->exposure > PAC207_EXPOSURE_KNEE) {

			else if (sd->exposure > PAC207_EXPOSURE_KNEE)

				sd->exposure--;

			} else if (sd->gain > PAC207_GAIN_DEFAULT) {

			else if (sd->gain > PAC207_GAIN_DEFAULT)

				sd->gain--;

			} else if (sd->exposure > PAC207_EXPOSURE_MIN) {

			else if (sd->exposure > PAC207_EXPOSURE_MIN)

				sd->exposure--;

			} else if (sd->gain > PAC207_GAIN_MIN) {

			else if (sd->gain > PAC207_GAIN_MIN)

				sd->gain--;

			} else

			else

				break;

		} else {

			if (sd->gain < PAC207_GAIN_DEFAULT) {

			if (sd->gain < PAC207_GAIN_DEFAULT)

				sd->gain++;

			} else if (sd->exposure < PAC207_EXPOSURE_KNEE) {

			else if (sd->exposure < PAC207_EXPOSURE_KNEE)

				sd->exposure++;

			} else if (sd->gain < PAC207_GAIN_KNEE) {

			else if (sd->gain < PAC207_GAIN_KNEE)

				sd->gain++;

			} else if (sd->exposure < PAC207_EXPOSURE_MAX) {

			else if (sd->exposure < PAC207_EXPOSURE_MAX)

				sd->exposure++;

			} else if (sd->gain < PAC207_GAIN_MAX) {

			else if (sd->gain < PAC207_GAIN_MAX)

				sd->gain++;

			} else

			else

				break;

		}

	}

drivers/media/video/gspca/pac7311.c

+2 −1
Original line number Diff line number Diff line
@@ -714,7 +714,8 @@ static __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x093a, 0x2601), DVNM("Philips SPC610NC")},

	{USB_DEVICE(0x093a, 0x2603), DVNM("PAC7312")},

	{USB_DEVICE(0x093a, 0x2608), DVNM("Trust WB-3300p")},

	{USB_DEVICE(0x093a, 0x260e), DVNM("Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350")},

	{USB_DEVICE(0x093a, 0x260e), DVNM("Gigaware VGA PC Camera")},

			/* and also ', Trust WB-3350p, SIGMA cam 2350' */

	{USB_DEVICE(0x093a, 0x260f), DVNM("SnakeCam")},

	{USB_DEVICE(0x093a, 0x2621), DVNM("PAC731x")},

	{}

drivers/media/video/gspca/sonixb.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")},

	{USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")},

	{USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")},

	{USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia-OV6650-SN9C101G")},

	{USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")},

	{USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")},

	{USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")},

	{USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")},