aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/go7007/go7007-usb.c
diff options
context:
space:
mode:
authorPete Eberlein <pete@sensoray.com>2009-09-18 20:28:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:53:48 -0400
commitf4a7d6e4ef5ae06dc81803d3e69df3c959207d1c (patch)
treefcd675a2e95c86f8f7b7588e3989adbeb2cbe834 /drivers/staging/go7007/go7007-usb.c
parentc24db7065e9ed717c38792fc23075fcd02a0a544 (diff)
V4L/DVB (13021): go7007: Fix whitespace and line lengths
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>
Diffstat (limited to 'drivers/staging/go7007/go7007-usb.c')
-rw-r--r--drivers/staging/go7007/go7007-usb.c48
1 files changed, 25 insertions, 23 deletions
diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c
index ff4fb36d907..ecaa3c989cf 100644
--- a/drivers/staging/go7007/go7007-usb.c
+++ b/drivers/staging/go7007/go7007-usb.c
@@ -33,7 +33,8 @@
33 33
34static unsigned int assume_endura; 34static unsigned int assume_endura;
35module_param(assume_endura, int, 0644); 35module_param(assume_endura, int, 0644);
36MODULE_PARM_DESC(assume_endura, "when probing fails, hardware is a Pelco Endura"); 36MODULE_PARM_DESC(assume_endura, "when probing fails, "
37 "hardware is a Pelco Endura");
37 38
38/* #define GO7007_USB_DEBUG */ 39/* #define GO7007_USB_DEBUG */
39/* #define GO7007_I2C_DEBUG */ /* for debugging the EZ-USB I2C adapter */ 40/* #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"
44 45
45/* 46/*
46 * Pipes on EZ-USB interface: 47 * Pipes on EZ-USB interface:
47 * 0 snd - Control 48 * 0 snd - Control
48 * 0 rcv - Control 49 * 0 rcv - Control
49 * 2 snd - Download firmware (control) 50 * 2 snd - Download firmware (control)
50 * 4 rcv - Read Interrupt (interrupt) 51 * 4 rcv - Read Interrupt (interrupt)
51 * 6 rcv - Read Video (bulk) 52 * 6 rcv - Read Video (bulk)
52 * 8 rcv - Read Audio (bulk) 53 * 8 rcv - Read Audio (bulk)
53 */ 54 */
54 55
55#define GO7007_USB_EZUSB (1<<0) 56#define GO7007_USB_EZUSB (1<<0)
@@ -97,7 +98,7 @@ static struct go7007_usb_board board_matrix_ii = {
97 }, 98 },
98 }, 99 },
99 .num_inputs = 2, 100 .num_inputs = 2,
100 .inputs = { 101 .inputs = {
101 { 102 {
102 .video_input = 0, 103 .video_input = 0,
103 .name = "Composite", 104 .name = "Composite",
@@ -134,7 +135,7 @@ static struct go7007_usb_board board_matrix_reload = {
134 }, 135 },
135 }, 136 },
136 .num_inputs = 2, 137 .num_inputs = 2,
137 .inputs = { 138 .inputs = {
138 { 139 {
139 .video_input = 0, 140 .video_input = 0,
140 .name = "Composite", 141 .name = "Composite",
@@ -172,7 +173,7 @@ static struct go7007_usb_board board_star_trek = {
172 }, 173 },
173 }, 174 },
174 .num_inputs = 2, 175 .num_inputs = 2,
175 .inputs = { 176 .inputs = {
176 { 177 {
177 .video_input = 1, 178 .video_input = 1,
178 /* .audio_input = AUDIO_EXTERN, */ 179 /* .audio_input = AUDIO_EXTERN, */
@@ -228,7 +229,7 @@ static struct go7007_usb_board board_px_tv402u = {
228 }, 229 },
229 }, 230 },
230 .num_inputs = 3, 231 .num_inputs = 3,
231 .inputs = { 232 .inputs = {
232 { 233 {
233 .video_input = 1, 234 .video_input = 1,
234 .audio_input = TVAUDIO_INPUT_EXTERN, 235 .audio_input = TVAUDIO_INPUT_EXTERN,
@@ -276,7 +277,7 @@ static struct go7007_usb_board board_xmen = {
276 }, 277 },
277 }, 278 },
278 .num_inputs = 1, 279 .num_inputs = 1,
279 .inputs = { 280 .inputs = {
280 { 281 {
281 .name = "Camera", 282 .name = "Camera",
282 }, 283 },
@@ -309,7 +310,7 @@ static struct go7007_usb_board board_matrix_revolution = {
309 }, 310 },
310 }, 311 },
311 .num_inputs = 2, 312 .num_inputs = 2,
312 .inputs = { 313 .inputs = {
313 { 314 {
314 .video_input = 2, 315 .video_input = 2,
315 .name = "Composite", 316 .name = "Composite",
@@ -341,7 +342,7 @@ static struct go7007_usb_board board_lifeview_lr192 = {
341 GO7007_SENSOR_SCALING, 342 GO7007_SENSOR_SCALING,
342 .num_i2c_devs = 0, 343 .num_i2c_devs = 0,
343 .num_inputs = 1, 344 .num_inputs = 1,
344 .inputs = { 345 .inputs = {
345 { 346 {
346 .video_input = 0, 347 .video_input = 0,
347 .name = "Composite", 348 .name = "Composite",
@@ -367,7 +368,7 @@ static struct go7007_usb_board board_endura = {
367 .sensor_h_offset = 8, 368 .sensor_h_offset = 8,
368 .num_i2c_devs = 0, 369 .num_i2c_devs = 0,
369 .num_inputs = 1, 370 .num_inputs = 1,
370 .inputs = { 371 .inputs = {
371 { 372 {
372 .name = "Camera", 373 .name = "Camera",
373 }, 374 },
@@ -399,7 +400,7 @@ static struct go7007_usb_board board_adlink_mpg24 = {
399 }, 400 },
400 }, 401 },
401 .num_inputs = 1, 402 .num_inputs = 1,
402 .inputs = { 403 .inputs = {
403 { 404 {
404 .name = "Composite", 405 .name = "Composite",
405 }, 406 },
@@ -430,7 +431,7 @@ static struct go7007_usb_board board_sensoray_2250 = {
430 }, 431 },
431 }, 432 },
432 .num_inputs = 2, 433 .num_inputs = 2,
433 .inputs = { 434 .inputs = {
434 { 435 {
435 .video_input = 0, 436 .video_input = 0,
436 .name = "Composite", 437 .name = "Composite",
@@ -741,7 +742,8 @@ static void go7007_usb_read_video_pipe_complete(struct urb *urb)
741 return; 742 return;
742 } 743 }
743 if (status) { 744 if (status) {
744 printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", status); 745 printk(KERN_ERR "go7007-usb: error in video pipe: %d\n",
746 status);
745 return; 747 return;
746 } 748 }
747 if (urb->actual_length != urb->transfer_buffer_length) { 749 if (urb->actual_length != urb->transfer_buffer_length) {
@@ -762,7 +764,8 @@ static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
762 if (!go->streaming) 764 if (!go->streaming)
763 return; 765 return;
764 if (status) { 766 if (status) {
765 printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", status); 767 printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n",
768 status);
766 return; 769 return;
767 } 770 }
768 if (urb->actual_length != urb->transfer_buffer_length) { 771 if (urb->actual_length != urb->transfer_buffer_length) {
@@ -1017,7 +1020,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
1017 break; 1020 break;
1018 case GO7007_BOARDID_SENSORAY_2250: 1021 case GO7007_BOARDID_SENSORAY_2250:
1019 printk(KERN_INFO "Sensoray 2250 found\n"); 1022 printk(KERN_INFO "Sensoray 2250 found\n");
1020 name = "Sensoray 2250/2251\n"; 1023 name = "Sensoray 2250/2251";
1021 board = &board_sensoray_2250; 1024 board = &board_sensoray_2250;
1022 break; 1025 break;
1023 default: 1026 default:
@@ -1096,7 +1099,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
1096 usb->board = board = &board_endura; 1099 usb->board = board = &board_endura;
1097 go->board_info = &board->main_info; 1100 go->board_info = &board->main_info;
1098 strncpy(go->name, "Pelco Endura", 1101 strncpy(go->name, "Pelco Endura",
1099 sizeof(go->name)); 1102 sizeof(go->name));
1100 } else { 1103 } else {
1101 u16 channel; 1104 u16 channel;
1102 1105
@@ -1154,8 +1157,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
1154 * to the EZ-USB GPIO output pins */ 1157 * to the EZ-USB GPIO output pins */
1155 if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0, 1158 if (go7007_usb_vendor_request(go, 0x40, 0x7f02, 0,
1156 NULL, 0, 0) < 0) { 1159 NULL, 0, 0) < 0) {
1157 printk(KERN_ERR 1160 printk(KERN_ERR "go7007-usb: GPIO write failed!\n");
1158 "go7007-usb: GPIO write failed!\n");
1159 goto initfail; 1161 goto initfail;
1160 } 1162 }
1161 } 1163 }