leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (13021): go7007: Fix whitespace and line lengths

Browse Source 
Trailing whitespace is removed.
Source lines wrap at 80 columns.

Signed-off-by: Pete Eberlein <pete@sensoray.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Pete Eberlein 2009-09-18 21:28:59 -03:00 committed by Mauro Carvalho Chehab
parent c24db7065e
commit f4a7d6e4ef
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/staging/go7007/go7007-usb.c
View File

@ -33,7 +33,8 @@
static unsigned int assume_endura;
module_param(assume_endura, int, 0644);
MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura");
MODULE_PARM_DESC(assume_endura, "when probing fails, "
"hardware is a Pelco Endura");
/* #define GO7007_USB_DEBUG */
/* #define GO7007_I2C_DEBUG */ /* for debugging the EZ-USB I2C adapter */
@ -44,12 +45,12 @@ MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura"
/*
* Pipes on EZ-USB interface:
* 0 snd - Control
* 0 rcv - Control
* 2 snd - Download firmware (control)
* 4 rcv - Read Interrupt (interrupt)
* 6 rcv - Read Video (bulk)
* 8 rcv - Read Audio (bulk)
* 0 snd - Control
* 0 rcv - Control
* 2 snd - Download firmware (control)
* 4 rcv - Read Interrupt (interrupt)
* 6 rcv - Read Video (bulk)
* 8 rcv - Read Audio (bulk)
*/
#define GO7007_USB_EZUSB (1<<0)
@ -97,7 +98,7 @@ static struct go7007_usb_board board_matrix_ii = {
},
},
.num_inputs = 2,
.inputs = {
.inputs = {
{
.video_input = 0,
.name = "Composite",
@ -134,7 +135,7 @@ static struct go7007_usb_board board_matrix_reload = {
},
},
.num_inputs = 2,
.inputs = {
.inputs = {
{
.video_input = 0,
.name = "Composite",
@ -172,7 +173,7 @@ static struct go7007_usb_board board_star_trek = {
},
},
.num_inputs = 2,
.inputs = {
.inputs = {
{
.video_input = 1,
/* .audio_input = AUDIO_EXTERN, */
@ -228,7 +229,7 @@ static struct go7007_usb_board board_px_tv402u = {
},
},
.num_inputs = 3,
.inputs = {
.inputs = {
{
.video_input = 1,
.audio_input = TVAUDIO_INPUT_EXTERN,
@ -276,7 +277,7 @@ static struct go7007_usb_board board_xmen = {
},
},
.num_inputs = 1,
.inputs = {
.inputs = {
{
.name = "Camera",
},
@ -309,7 +310,7 @@ static struct go7007_usb_board board_matrix_revolution = {
},
},
.num_inputs = 2,
.inputs = {
.inputs = {
{
.video_input = 2,
.name = "Composite",
@ -341,7 +342,7 @@ static struct go7007_usb_board board_lifeview_lr192 = {
GO7007_SENSOR_SCALING,
.num_i2c_devs = 0,
.num_inputs = 1,
.inputs = {
.inputs = {
{
.video_input = 0,
.name = "Composite",
@ -367,7 +368,7 @@ static struct go7007_usb_board board_endura = {
.sensor_h_offset = 8,
.num_i2c_devs = 0,
.num_inputs = 1,
.inputs = {
.inputs = {
{
.name = "Camera",
},
@ -399,7 +400,7 @@ static struct go7007_usb_board board_adlink_mpg24 = {
},
},
.num_inputs = 1,
.inputs = {
.inputs = {
{
.name = "Composite",
},
@ -430,7 +431,7 @@ static struct go7007_usb_board board_sensoray_2250 = {
},
},
.num_inputs = 2,
.inputs = {
.inputs = {
{
.video_input = 0,
.name = "Composite",
@ -741,7 +742,8 @@ static void go7007_usb_read_video_pipe_complete(struct urb *urb)
return;
}
if (status) {
printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", status);
printk(KERN_ERR "go7007-usb: error in video pipe: %d\n",
status);
return;
}
if (urb->actual_length != urb->transfer_buffer_length) {
@ -762,7 +764,8 @@ static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
if (!go->streaming)
return;
if (status) {
printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", status);
printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n",
status);
return;
}
if (urb->actual_length != urb->transfer_buffer_length) {
@ -1017,7 +1020,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
break;
case GO7007_BOARDID_SENSORAY_2250:
printk(KERN_INFO "Sensoray 2250 found\n");
name = "Sensoray 2250/2251\n";
name = "Sensoray 2250/2251";
board = &board_sensoray_2250;
break;
default:
@ -1096,7 +1099,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
usb->board = board = &board_endura;
go->board_info = &board->main_info;
strncpy(go->name, "Pelco Endura",
sizeof(go->name));
sizeof(go->name));
} else {
u16 channel;
@ -1154,8 +1157,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
* to the EZ-USB GPIO output pins */
if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,
NULL, 0, 0) < 0) {
printk(KERN_ERR
"go7007-usb: GPIO write failed!\n");
printk(KERN_ERR "go7007-usb: GPIO write failed!\n");
goto initfail;
}
}