[media] usbvision: coding style (6d6a48e5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/media/video/usbvision/usbvision-core.c

+299 −396

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/usbvision/usbvision-i2c.c

+19 −22

Original line number	Diff line number	Diff line
		@@ -28,14 +28,14 @@
		#include <linux/module.h>
		#include <linux/delay.h>
		#include <linux/init.h>
		#include <asm/uaccess.h>
		#include <linux/uaccess.h>
		#include <linux/ioport.h>
		#include <linux/errno.h>
		#include <linux/usb.h>
		#include <linux/i2c.h>
		#include "usbvision.h"

		#define DBG_I2C 1<<0
		#define DBG_I2C (1 << 0)

		static int i2c_debug;

		@@ -143,10 +143,9 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
		else
		ret = try_write_address(i2c_adap, addr, retries);

		if (ret != 1) {
		if (ret != 1)
		return -EREMOTEIO;
		}
		}
		return 0;
		}

		@@ -171,17 +170,15 @@ usbvision_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
		if (pmsg->flags & I2C_M_RD) {
		/* read bytes into buffer */
		ret = (usbvision_i2c_read(usbvision, addr, pmsg->buf, pmsg->len));
		if (ret < pmsg->len) {
		if (ret < pmsg->len)
		return (ret < 0) ? ret : -EREMOTEIO;
		}
		} else {
		/* write bytes from buffer */
		ret = (usbvision_i2c_write(usbvision, addr, pmsg->buf, pmsg->len));
		if (ret < pmsg->len) {
		if (ret < pmsg->len)
		return (ret < 0) ? ret : -EREMOTEIO;
		}
		}
		}
		return num;
		}

		@@ -355,10 +352,10 @@ usbvision_i2c_read_max4(struct usb_usbvision *usbvision, unsigned char addr,

		if (i2c_debug & DBG_I2C) {
		int idx;
		for (idx = 0; idx < len; idx++) {

		for (idx = 0; idx < len; idx++)
		PDEBUG(DBG_I2C, "read %x from address %x", (unsigned char)buf[idx], addr);
		}
		}
		return len;
		}

		@@ -416,10 +413,10 @@ static int usbvision_i2c_write_max4(struct usb_usbvision *usbvision,

		if (i2c_debug & DBG_I2C) {
		int idx;
		for (idx = 0; idx < len; idx++) {

		for (idx = 0; idx < len; idx++)
		PDEBUG(DBG_I2C, "wrote %x at address %x", (unsigned char)buf[idx], addr);
		}
		}
		return len;
		}

drivers/media/video/usbvision/usbvision-video.c

+149 −179

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/spinlock.h>
		#include <asm/io.h>
		#include <linux/io.h>
		#include <linux/videodev2.h>
		#include <linux/i2c.h>

		@@ -99,9 +99,9 @@ USBVISION_DRIVER_VERSION_PATCHLEVEL)
		#define PDEBUG(level, fmt, args...) do {} while (0)
		#endif

		#define DBG_IO 1<<1
		#define DBG_PROBE 1<<2
		#define DBG_MMAP 1<<3
		#define DBG_IO (1 << 1)
		#define DBG_PROBE (1 << 2)
		#define DBG_MMAP (1 << 3)

		/* String operations */
		#define rmspace(str) while (*str == ' ') str++;
		@@ -291,6 +291,7 @@ static DEVICE_ATTR(bridge, S_IRUGO, show_device_bridge, NULL);
		static void usbvision_create_sysfs(struct video_device *vdev)
		{
		int res;

		if (!vdev)
		return;
		do {
		@@ -531,11 +532,11 @@ static int vidioc_enum_input (struct file file, void priv,

		if (vi->index >= usbvision->video_inputs)
		return -EINVAL;
		if (usbvision->have_tuner) {
		if (usbvision->have_tuner)
		chan = vi->index;
		} else {
		else
		chan = vi->index + 1; /* skip Television string*/
		}

		/* Determine the requested input characteristics
		specific for each usbvision card model */
		switch (chan) {
		@@ -552,20 +553,18 @@ static int vidioc_enum_input (struct file file, void priv,
		break;
		case 1:
		vi->type = V4L2_INPUT_TYPE_CAMERA;
		if (usbvision_device_data[usbvision->dev_model].video_channels == 4) {
		if (usbvision_device_data[usbvision->dev_model].video_channels == 4)
		strcpy(vi->name, "Green Video Input");
		} else {
		else
		strcpy(vi->name, "Composite Video Input");
		}
		vi->std = V4L2_STD_PAL;
		break;
		case 2:
		vi->type = V4L2_INPUT_TYPE_CAMERA;
		if (usbvision_device_data[usbvision->dev_model].video_channels == 4) {
		if (usbvision_device_data[usbvision->dev_model].video_channels == 4)
		strcpy(vi->name, "Yellow Video Input");
		} else {
		else
		strcpy(vi->name, "S-Video Input");
		}
		vi->std = V4L2_STD_PAL;
		break;
		case 3:
		@@ -652,11 +651,10 @@ static int vidioc_g_frequency (struct file file, void priv,
		struct usb_usbvision *usbvision = video_drvdata(file);

		freq->tuner = 0; /* Only one tuner */
		if(usbvision->radio) {
		if (usbvision->radio)
		freq->type = V4L2_TUNER_RADIO;
		} else {
		else
		freq->type = V4L2_TUNER_ANALOG_TV;
		}
		freq->frequency = usbvision->freq;

		return 0;
		@@ -681,11 +679,10 @@ static int vidioc_g_audio (struct file file, void priv, struct v4l2_audio *a)
		{
		struct usb_usbvision *usbvision = video_drvdata(file);

		if(usbvision->radio) {
		if (usbvision->radio)
		strcpy(a->name, "Radio");
		} else {
		else
		strcpy(a->name, "TV");
		}

		return 0;
		}
		@@ -693,10 +690,8 @@ static int vidioc_g_audio (struct file file, void priv, struct v4l2_audio *a)
		static int vidioc_s_audio(struct file file, void fh,
		struct v4l2_audio *a)
		{
		if(a->index) {
		if (a->index)
		return -EINVAL;
		}

		return 0;
		}

		@@ -717,8 +712,8 @@ static int vidioc_g_ctrl (struct file file, void priv,
		struct v4l2_control *ctrl)
		{
		struct usb_usbvision *usbvision = video_drvdata(file);
		call_all(usbvision, core, g_ctrl, ctrl);

		call_all(usbvision, core, g_ctrl, ctrl);
		return 0;
		}

		@@ -726,8 +721,8 @@ static int vidioc_s_ctrl (struct file file, void priv,
		struct v4l2_control *ctrl)
		{
		struct usb_usbvision *usbvision = video_drvdata(file);
		call_all(usbvision, core, s_ctrl, ctrl);

		call_all(usbvision, core, s_ctrl, ctrl);
		return 0;
		}

		@@ -745,7 +740,8 @@ static int vidioc_reqbufs (struct file *file,
		return -EINVAL;

		if (usbvision->streaming == stream_on) {
		if ((ret = usbvision_stream_interrupt(usbvision)))
		ret = usbvision_stream_interrupt(usbvision);
		if (ret)
		return ret;
		}

		@@ -766,9 +762,8 @@ static int vidioc_querybuf (struct file *file,

		/* FIXME : must control
		that buffers are mapped (VIDIOC_REQBUFS has been called) */
		if(vb->index>=usbvision->num_frames) {
		if (vb->index >= usbvision->num_frames)
		return -EINVAL;
		}
		/* Updating the corresponding frame state */
		vb->flags = 0;
		frame = &usbvision->frame[vb->index];
		@@ -799,15 +794,13 @@ static int vidioc_qbuf (struct file file, void priv, struct v4l2_buffer *vb)
		unsigned long lock_flags;

		/* FIXME : works only on VIDEO_CAPTURE MODE, MMAP. */
		if(vb->index>=usbvision->num_frames) {
		if (vb->index >= usbvision->num_frames)
		return -EINVAL;
		}

		frame = &usbvision->frame[vb->index];

		if (frame->grabstate != frame_state_unused) {
		if (frame->grabstate != frame_state_unused)
		return -EAGAIN;
		}

		/* Mark it as ready and enqueue frame */
		frame->grabstate = frame_state_ready;
		@@ -895,9 +888,8 @@ static int vidioc_streamoff(struct file *file,
		static int vidioc_enum_fmt_vid_cap(struct file file, void priv,
		struct v4l2_fmtdesc *vfd)
		{
		if(vfd->index>=USBVISION_SUPPORTED_PALETTES-1) {
		if (vfd->index >= USBVISION_SUPPORTED_PALETTES - 1)
		return -EINVAL;
		}
		strcpy(vfd->description, usbvision_v4l2_format[vfd->index].desc);
		vfd->pixelformat = usbvision_v4l2_format[vfd->index].format;
		return 0;
		@@ -934,9 +926,8 @@ static int vidioc_try_fmt_vid_cap (struct file file, void priv,
		}
		}
		/* robustness */
		if(format_idx == USBVISION_SUPPORTED_PALETTES) {
		if (format_idx == USBVISION_SUPPORTED_PALETTES)
		return -EINVAL;
		}
		RESTRICT_TO_RANGE(vf->fmt.pix.width, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
		RESTRICT_TO_RANGE(vf->fmt.pix.height, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);

		@@ -953,13 +944,14 @@ static int vidioc_s_fmt_vid_cap(struct file file, void priv,
		struct usb_usbvision *usbvision = video_drvdata(file);
		int ret;

		if( 0 != (ret=vidioc_try_fmt_vid_cap (file, priv, vf)) ) {
		ret = vidioc_try_fmt_vid_cap(file, priv, vf);
		if (ret)
		return ret;
		}

		/* stop io in case it is already in progress */
		if (usbvision->streaming == stream_on) {
		if ((ret = usbvision_stream_interrupt(usbvision)))
		ret = usbvision_stream_interrupt(usbvision);
		if (ret)
		return ret;
		}
		usbvision_frames_free(usbvision);
		@@ -979,7 +971,6 @@ static ssize_t usbvision_v4l2_read(struct file file, char __user buf,
		struct usb_usbvision *usbvision = video_drvdata(file);
		int noblock = file->f_flags & O_NONBLOCK;
		unsigned long lock_flags;

		int ret, i;
		struct usbvision_frame *frame;

		@@ -1059,9 +1050,8 @@ static ssize_t usbvision_v4l2_read(struct file file, char __user buf,
		if ((count + frame->bytes_read) > (unsigned long)frame->scanlength)
		count = frame->scanlength - frame->bytes_read;

		if (copy_to_user(buf, frame->data + frame->bytes_read, count)) {
		if (copy_to_user(buf, frame->data + frame->bytes_read, count))
		return -EFAULT;
		}

		frame->bytes_read += count;
		PDEBUG(DBG_IO, "%s: {copy} count used=%ld, new bytes_read=%ld",
		@@ -1089,9 +1079,8 @@ static int usbvision_v4l2_mmap(struct file file, struct vm_area_struct vma)

		PDEBUG(DBG_MMAP, "mmap");

		if (!USBVISION_IS_OPERATIONAL(usbvision)) {
		if (!USBVISION_IS_OPERATIONAL(usbvision))
		return -EFAULT;
		}

		if (!(vma->vm_flags & VM_WRITE) \|\|
		size != PAGE_ALIGN(usbvision->max_frame_size)) {
		@@ -1115,7 +1104,6 @@ static int usbvision_v4l2_mmap(struct file file, struct vm_area_struct vma)

		pos = usbvision->frame[i].data;
		while (size > 0) {

		if (vm_insert_page(vma, start, vmalloc_to_page(pos))) {
		PDEBUG(DBG_MMAP, "mmap: vm_insert_page failed");
		return -EAGAIN;
		@@ -1145,8 +1133,7 @@ static int usbvision_radio_open(struct file *file)
		"%s: Someone tried to open an already opened USBVision Radio!\n",
		__func__);
		err_code = -EBUSY;
		}
		else {
		} else {
		if (power_on_at_open) {
		usbvision_reset_power_off_timer(usbvision);
		if (usbvision->power == 0) {
		@@ -1315,9 +1302,8 @@ static struct video_device usbvision_vdev_init(struct usb_usbvision usbvision,
		}

		vdev = video_device_alloc();
		if (NULL == vdev) {
		if (NULL == vdev)
		return NULL;
		}
		vdev = vdev_template;
		vdev->lock = &usbvision->v4l2_lock;
		vdev->v4l2_dev = &usbvision->v4l2_dev;
		@@ -1333,11 +1319,10 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
		if (usbvision->rdev) {
		PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
		video_device_node_name(usbvision->rdev));
		if (video_is_registered(usbvision->rdev)) {
		if (video_is_registered(usbvision->rdev))
		video_unregister_device(usbvision->rdev);
		} else {
		else
		video_device_release(usbvision->rdev);
		}
		usbvision->rdev = NULL;
		}

		@@ -1345,11 +1330,10 @@ static void usbvision_unregister_video(struct usb_usbvision *usbvision)
		if (usbvision->vdev) {
		PDEBUG(DBG_PROBE, "unregister %s [v4l2]",
		video_device_node_name(usbvision->vdev));
		if (video_is_registered(usbvision->vdev)) {
		if (video_is_registered(usbvision->vdev))
		video_unregister_device(usbvision->vdev);
		} else {
		else
		video_device_release(usbvision->vdev);
		}
		usbvision->vdev = NULL;
		}
		}
		@@ -1361,14 +1345,10 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
		usbvision->vdev = usbvision_vdev_init(usbvision,
		&usbvision_video_template,
		"USBVision Video");
		if (usbvision->vdev == NULL) {
		if (usbvision->vdev == NULL)
		goto err_exit;
		}
		if (video_register_device(usbvision->vdev,
		VFL_TYPE_GRABBER,
		video_nr)<0) {
		if (video_register_device(usbvision->vdev, VFL_TYPE_GRABBER, video_nr) < 0)
		goto err_exit;
		}
		printk(KERN_INFO "USBVision[%d]: registered USBVision Video device %s [v4l2]\n",
		usbvision->nr, video_device_node_name(usbvision->vdev));

		@@ -1378,14 +1358,10 @@ static int __devinit usbvision_register_video(struct usb_usbvision *usbvision)
		usbvision->rdev = usbvision_vdev_init(usbvision,
		&usbvision_radio_template,
		"USBVision Radio");
		if (usbvision->rdev == NULL) {
		if (usbvision->rdev == NULL)
		goto err_exit;
		}
		if (video_register_device(usbvision->rdev,
		VFL_TYPE_RADIO,
		radio_nr)<0) {
		if (video_register_device(usbvision->rdev, VFL_TYPE_RADIO, radio_nr) < 0)
		goto err_exit;
		}
		printk(KERN_INFO "USBVision[%d]: registered USBVision Radio device %s [v4l2]\n",
		usbvision->nr, video_device_node_name(usbvision->rdev));
		}
		@@ -1459,9 +1435,7 @@ static void usbvision_release(struct usb_usbvision *usbvision)
		usbvision_remove_sysfs(usbvision->vdev);
		usbvision_unregister_video(usbvision);

		if (usbvision->ctrl_urb) {
		usb_free_urb(usbvision->ctrl_urb);
		}

		v4l2_device_unregister(&usbvision->v4l2_dev);
		kfree(usbvision);
		@@ -1527,18 +1501,17 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
		dev->descriptor.idProduct, ifnum);

		model = devid->driver_info;
		if ( (model<0) \|\| (model>=usbvision_device_data_size) ) {
		if (model < 0 \|\| model >= usbvision_device_data_size) {
		PDEBUG(DBG_PROBE, "model out of bounds %d", model);
		return -ENODEV;
		}
		printk(KERN_INFO "%s: %s found\n", __func__,
		usbvision_device_data[model].model_string);

		if (usbvision_device_data[model].interface >= 0) {
		if (usbvision_device_data[model].interface >= 0)
		interface = &dev->actconfig->interface[usbvision_device_data[model].interface]->altsetting[0];
		} else {
		else
		interface = &dev->actconfig->interface[ifnum]->altsetting[0];
		}
		endpoint = &interface->endpoint[1].desc;
		if (!usb_endpoint_xfer_isoc(endpoint)) {
		dev_err(&intf->dev, "%s: interface %d. has non-ISO endpoint!\n",
		@@ -1559,13 +1532,12 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
		return -ENOMEM;
		}

		if (dev->descriptor.bNumConfigurations > 1) {
		if (dev->descriptor.bNumConfigurations > 1)
		usbvision->bridge_type = BRIDGE_NT1004;
		} else if (model == DAZZLE_DVC_90_REV_1_SECAM) {
		else if (model == DAZZLE_DVC_90_REV_1_SECAM)
		usbvision->bridge_type = BRIDGE_NT1005;
		} else {
		else
		usbvision->bridge_type = BRIDGE_NT1003;
		}
		PDEBUG(DBG_PROBE, "bridge_type %d", usbvision->bridge_type);

		/* compute alternate max packet sizes */
		@@ -1573,8 +1545,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,

		usbvision->num_alt = uif->num_altsetting;
		PDEBUG(DBG_PROBE, "Alternate settings: %i", usbvision->num_alt);
		usbvision->alt_max_pkt_size = kmalloc(32*
		usbvision->num_alt,GFP_KERNEL);
		usbvision->alt_max_pkt_size = kmalloc(32 * usbvision->num_alt, GFP_KERNEL);
		if (usbvision->alt_max_pkt_size == NULL) {
		dev_err(&intf->dev, "usbvision: out of memory!\n");
		return -ENOMEM;
		@@ -1593,9 +1564,8 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
		usbvision->nr = usbvision_nr++;

		usbvision->have_tuner = usbvision_device_data[model].tuner;
		if (usbvision->have_tuner) {
		if (usbvision->have_tuner)
		usbvision->tuner_type = usbvision_device_data[model].tuner_type;
		}

		usbvision->dev_model = model;
		usbvision->remove_pending = 0;

drivers/media/video/usbvision/usbvision.h

+24 −23

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@
		#define USBVISION_NUMFRAMES 3 /* Maximum number of frames an application can get */
		#define USBVISION_NUMSBUF 2 /* Dimensioning the USB S buffering */

		#define USBVISION_POWEROFF_TIME 3 * (HZ) /* 3 seconds */
		#define USBVISION_POWEROFF_TIME (3 * HZ) /* 3 seconds */


		#define FRAMERATE_MIN 0
		@@ -161,7 +161,8 @@ enum {
		};

		/* This macro restricts an int variable to an inclusive range */
		#define RESTRICT_TO_RANGE(v,mi,ma) { if ((v) < (mi)) (v) = (mi); else if ((v) > (ma)) (v) = (ma); }
		#define RESTRICT_TO_RANGE(v, mi, ma) \
		{ if ((v) < (mi)) (v) = (mi); else if ((v) > (ma)) (v) = (ma); }

		/*
		* We use macros to do YUV -> RGB conversion because this is

drivers/media/video/usbvision/usbvision-cards.c

+66 −66

File changed.

Contains only whitespace changes.