Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] gspca: Fix some warnings tied to 'no debug'

This patch fixes the warnings raised by unsetting the option GSPCA_DEBUG.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Jean-François Moine and committed by
Mauro Carvalho Chehab
bd62bbcd cf221766

+9 -16
+1 -14
drivers/media/video/gspca/gl860/gl860.c
··· 499 499 static int sd_probe(struct usb_interface *intf, 500 500 const struct usb_device_id *id) 501 501 { 502 - struct gspca_dev *gspca_dev; 503 - s32 ret; 504 - 505 - ret = gspca_dev_probe(intf, id, 502 + return gspca_dev_probe(intf, id, 506 503 &sd_desc_mi1320, sizeof(struct sd), THIS_MODULE); 507 - 508 - if (ret >= 0) { 509 - gspca_dev = usb_get_intfdata(intf); 510 - 511 - PDEBUG(D_PROBE, 512 - "Camera is now controlling video device %s", 513 - video_device_node_name(&gspca_dev->vdev)); 514 - } 515 - 516 - return ret; 517 504 } 518 505 519 506 static void sd_disconnect(struct usb_interface *intf)
+4 -1
drivers/media/video/gspca/spca508.c
··· 1375 1375 { 1376 1376 struct sd *sd = (struct sd *) gspca_dev; 1377 1377 struct cam *cam; 1378 - int data1, data2; 1379 1378 const u16 (*init_data)[2]; 1380 1379 static const u16 (*(init_data_tb[]))[2] = { 1381 1380 spca508_vista_init_data, /* CreativeVista 0 */ ··· 1384 1385 spca508cs110_init_data, /* MicroInnovationIC200 4 */ 1385 1386 spca508_init_data, /* ViewQuestVQ110 5 */ 1386 1387 }; 1388 + 1389 + #ifdef GSPCA_DEBUG 1390 + int data1, data2; 1387 1391 1388 1392 /* Read from global register the USB product and vendor IDs, just to 1389 1393 * prove that we can communicate with the device. This works, which ··· 1402 1400 1403 1401 data1 = reg_read(gspca_dev, 0x8621); 1404 1402 PDEBUG(D_PROBE, "Window 1 average luminance: %d", data1); 1403 + #endif 1405 1404 1406 1405 cam = &gspca_dev->cam; 1407 1406 cam->cam_mode = sif_mode;
+4 -1
drivers/media/video/gspca/zc3xx.c
··· 6266 6266 { 6267 6267 struct sd *sd = (struct sd *) gspca_dev; 6268 6268 int i; 6269 - u8 retbyte; 6270 6269 u16 retword; 6271 6270 6272 6271 /*fixme: lack of 8b=b3 (11,12)-> 10, 8b=e0 (14,15,16)-> 12 found in gspcav1*/ ··· 6358 6359 retword |= i2c_read(gspca_dev, 0x01); /* ID 1 */ 6359 6360 PDEBUG(D_PROBE, "probe 3wr vga 2 0x%04x", retword); 6360 6361 if (retword == 0x2030) { 6362 + #ifdef GSPCA_DEBUG 6363 + u8 retbyte; 6364 + 6361 6365 retbyte = i2c_read(gspca_dev, 0x02); /* revision number */ 6362 6366 PDEBUG(D_PROBE, "sensor PO2030 rev 0x%02x", retbyte); 6367 + #endif 6363 6368 send_unknown(gspca_dev, SENSOR_PO2030); 6364 6369 return retword; 6365 6370 }