diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-25 08:06:21 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:42 -0500 |
commit | 1bee0184f6ffba1263a4b1e5732cde2c5292d843 (patch) | |
tree | 9539e3a347c0620c41b444a316df3a286a335ccf /drivers/media/video/em28xx/em28xx-i2c.c | |
parent | ec5de990d912c0d5cca98e030bf6447c1529f56d (diff) |
V4L/DVB (9754): em28xx: improve debug messages
Now, the first message states board names. Also, removed printing the alternate
settings by default. I2C messages are now clearer.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-i2c.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 78d60231ee3f..d69f0efcc9aa 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -388,47 +388,49 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len) | |||
388 | if (em_eeprom->id == 0x9567eb1a) | 388 | if (em_eeprom->id == 0x9567eb1a) |
389 | dev->hash = em28xx_hash_mem(eedata, len, 32); | 389 | dev->hash = em28xx_hash_mem(eedata, len, 32); |
390 | 390 | ||
391 | printk(KERN_INFO "EEPROM ID= 0x%08x, hash = 0x%08lx\n", | 391 | printk(KERN_INFO "%s: EEPROM ID= 0x%08x, EEPROM hash = 0x%08lx\n", |
392 | em_eeprom->id, dev->hash); | 392 | dev->name, em_eeprom->id, dev->hash); |
393 | printk(KERN_INFO "Vendor/Product ID= %04x:%04x\n", em_eeprom->vendor_ID, | 393 | |
394 | em_eeprom->product_ID); | 394 | printk(KERN_INFO "%s: EEPROM info:\n", dev->name); |
395 | 395 | ||
396 | switch (em_eeprom->chip_conf >> 4 & 0x3) { | 396 | switch (em_eeprom->chip_conf >> 4 & 0x3) { |
397 | case 0: | 397 | case 0: |
398 | printk(KERN_INFO "No audio on board.\n"); | 398 | printk(KERN_INFO "%s:\tNo audio on board.\n", dev->name); |
399 | break; | 399 | break; |
400 | case 1: | 400 | case 1: |
401 | printk(KERN_INFO "AC97 audio (5 sample rates)\n"); | 401 | printk(KERN_INFO "%s:\tAC97 audio (5 sample rates)\n", |
402 | dev->name); | ||
402 | break; | 403 | break; |
403 | case 2: | 404 | case 2: |
404 | printk(KERN_INFO "I2S audio, sample rate=32k\n"); | 405 | printk(KERN_INFO "%s:\tI2S audio, sample rate=32k\n", dev->name); |
405 | break; | 406 | break; |
406 | case 3: | 407 | case 3: |
407 | printk(KERN_INFO "I2S audio, 3 sample rates\n"); | 408 | printk(KERN_INFO "%s:\tI2S audio, 3 sample rates\n", dev->name); |
408 | break; | 409 | break; |
409 | } | 410 | } |
410 | 411 | ||
411 | if (em_eeprom->chip_conf & 1 << 3) | 412 | if (em_eeprom->chip_conf & 1 << 3) |
412 | printk(KERN_INFO "USB Remote wakeup capable\n"); | 413 | printk(KERN_INFO "%s:\tUSB Remote wakeup capable\n", dev->name); |
413 | 414 | ||
414 | if (em_eeprom->chip_conf & 1 << 2) | 415 | if (em_eeprom->chip_conf & 1 << 2) |
415 | printk(KERN_INFO "USB Self power capable\n"); | 416 | printk(KERN_INFO "%s:\tUSB Self power capable\n", dev->name); |
416 | 417 | ||
417 | switch (em_eeprom->chip_conf & 0x3) { | 418 | switch (em_eeprom->chip_conf & 0x3) { |
418 | case 0: | 419 | case 0: |
419 | printk(KERN_INFO "500mA max power\n"); | 420 | printk(KERN_INFO "%s:\t500mA max power\n", dev->name); |
420 | break; | 421 | break; |
421 | case 1: | 422 | case 1: |
422 | printk(KERN_INFO "400mA max power\n"); | 423 | printk(KERN_INFO "%s:\t400mA max power\n", dev->name); |
423 | break; | 424 | break; |
424 | case 2: | 425 | case 2: |
425 | printk(KERN_INFO "300mA max power\n"); | 426 | printk(KERN_INFO "%s:\t300mA max power\n", dev->name); |
426 | break; | 427 | break; |
427 | case 3: | 428 | case 3: |
428 | printk(KERN_INFO "200mA max power\n"); | 429 | printk(KERN_INFO "%s:\t200mA max power\n", dev->name); |
429 | break; | 430 | break; |
430 | } | 431 | } |
431 | printk(KERN_INFO "Table at 0x%02x, strings=0x%04x, 0x%04x, 0x%04x\n", | 432 | printk(KERN_INFO "%s:\tTable at 0x%02x, strings=0x%04x, 0x%04x, 0x%04x\n", |
433 | dev->name, | ||
432 | em_eeprom->string_idx_table, | 434 | em_eeprom->string_idx_table, |
433 | em_eeprom->string1, | 435 | em_eeprom->string1, |
434 | em_eeprom->string2, | 436 | em_eeprom->string2, |