|
|
@@ -2832,13 +2832,10 @@ static int em28xx_hint_board(struct em28xx *dev)
|
|
|
dev->tuner_type = em28xx_eeprom_hash[i].tuner;
|
|
|
|
|
|
em28xx_errdev("Your board has no unique USB ID.\n");
|
|
|
- em28xx_errdev("A hint were successfully done, "
|
|
|
- "based on eeprom hash.\n");
|
|
|
+ em28xx_errdev("A hint were successfully done, based on eeprom hash.\n");
|
|
|
em28xx_errdev("This method is not 100%% failproof.\n");
|
|
|
- em28xx_errdev("If the board were missdetected, "
|
|
|
- "please email this log to:\n");
|
|
|
- em28xx_errdev("\tV4L Mailing List "
|
|
|
- " <linux-media@vger.kernel.org>\n");
|
|
|
+ em28xx_errdev("If the board were missdetected, please email this log to:\n");
|
|
|
+ em28xx_errdev("\tV4L Mailing List <linux-media@vger.kernel.org>\n");
|
|
|
em28xx_errdev("Board detected as %s\n",
|
|
|
em28xx_boards[dev->model].name);
|
|
|
|
|
|
@@ -2864,13 +2861,10 @@ static int em28xx_hint_board(struct em28xx *dev)
|
|
|
dev->model = em28xx_i2c_hash[i].model;
|
|
|
dev->tuner_type = em28xx_i2c_hash[i].tuner;
|
|
|
em28xx_errdev("Your board has no unique USB ID.\n");
|
|
|
- em28xx_errdev("A hint were successfully done, "
|
|
|
- "based on i2c devicelist hash.\n");
|
|
|
+ em28xx_errdev("A hint were successfully done, based on i2c devicelist hash.\n");
|
|
|
em28xx_errdev("This method is not 100%% failproof.\n");
|
|
|
- em28xx_errdev("If the board were missdetected, "
|
|
|
- "please email this log to:\n");
|
|
|
- em28xx_errdev("\tV4L Mailing List "
|
|
|
- " <linux-media@vger.kernel.org>\n");
|
|
|
+ em28xx_errdev("If the board were missdetected, please email this log to:\n");
|
|
|
+ em28xx_errdev("\tV4L Mailing List <linux-media@vger.kernel.org>\n");
|
|
|
em28xx_errdev("Board detected as %s\n",
|
|
|
em28xx_boards[dev->model].name);
|
|
|
|
|
|
@@ -2878,17 +2872,14 @@ static int em28xx_hint_board(struct em28xx *dev)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- em28xx_errdev("Your board has no unique USB ID and thus need a "
|
|
|
- "hint to be detected.\n");
|
|
|
- em28xx_errdev("You may try to use card=<n> insmod option to "
|
|
|
- "workaround that.\n");
|
|
|
+ em28xx_errdev("Your board has no unique USB ID and thus need a hint to be detected.\n");
|
|
|
+ em28xx_errdev("You may try to use card=<n> insmod option to workaround that.\n");
|
|
|
em28xx_errdev("Please send an email with this log to:\n");
|
|
|
em28xx_errdev("\tV4L Mailing List <linux-media@vger.kernel.org>\n");
|
|
|
em28xx_errdev("Board eeprom hash is 0x%08lx\n", dev->hash);
|
|
|
em28xx_errdev("Board i2c devicelist hash is 0x%08lx\n", dev->i2c_hash);
|
|
|
|
|
|
- em28xx_errdev("Here is a list of valid choices for the card=<n>"
|
|
|
- " insmod option:\n");
|
|
|
+ em28xx_errdev("Here is a list of valid choices for the card=<n> insmod option:\n");
|
|
|
for (i = 0; i < em28xx_bcount; i++) {
|
|
|
em28xx_errdev(" card=%d -> %s\n",
|
|
|
i, em28xx_boards[i].name);
|
|
|
@@ -3035,11 +3026,9 @@ static void em28xx_card_setup(struct em28xx *dev)
|
|
|
|
|
|
if (dev->board.valid == EM28XX_BOARD_NOT_VALIDATED) {
|
|
|
em28xx_errdev("\n\n");
|
|
|
- em28xx_errdev("The support for this board weren't "
|
|
|
- "valid yet.\n");
|
|
|
+ em28xx_errdev("The support for this board weren't valid yet.\n");
|
|
|
em28xx_errdev("Please send a report of having this working\n");
|
|
|
- em28xx_errdev("not to V4L mailing list (and/or to other "
|
|
|
- "addresses)\n\n");
|
|
|
+ em28xx_errdev("not to V4L mailing list (and/or to other addresses)\n\n");
|
|
|
}
|
|
|
|
|
|
/* Free eeprom data memory */
|
|
|
@@ -3360,8 +3349,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
|
|
|
/* Resets I2C speed */
|
|
|
retval = em28xx_write_reg(dev, EM28XX_R06_I2C_CLK, dev->board.i2c_speed);
|
|
|
if (retval < 0) {
|
|
|
- em28xx_errdev("%s: em28xx_write_reg failed!"
|
|
|
- " retval [%d]\n",
|
|
|
+ em28xx_errdev("%s: em28xx_write_reg failed! retval [%d]\n",
|
|
|
__func__, retval);
|
|
|
return retval;
|
|
|
}
|
|
|
@@ -3429,7 +3417,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
|
|
|
nr = find_first_zero_bit(em28xx_devused, EM28XX_MAXBOARDS);
|
|
|
if (nr >= EM28XX_MAXBOARDS) {
|
|
|
/* No free device slots */
|
|
|
- printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
|
|
|
+ printk(DRIVER_NAME
|
|
|
+ ": Supports only %i em28xx boards.\n",
|
|
|
EM28XX_MAXBOARDS);
|
|
|
retval = -ENOMEM;
|
|
|
goto err_no_slot;
|
|
|
@@ -3438,8 +3427,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
|
|
|
|
|
|
/* Don't register audio interfaces */
|
|
|
if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
|
|
|
- em28xx_err(DRIVER_NAME " audio device (%04x:%04x): "
|
|
|
- "interface %i, class %i\n",
|
|
|
+ em28xx_err(DRIVER_NAME
|
|
|
+ " audio device (%04x:%04x): interface %i, class %i\n",
|
|
|
le16_to_cpu(udev->descriptor.idVendor),
|
|
|
le16_to_cpu(udev->descriptor.idProduct),
|
|
|
ifnum,
|
|
|
@@ -3502,7 +3491,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
|
|
|
has_vendor_audio = true;
|
|
|
} else {
|
|
|
printk(KERN_INFO DRIVER_NAME
|
|
|
- ": error: skipping audio endpoint 0x83, because it uses bulk transfers !\n");
|
|
|
+ ": error: skipping audio endpoint 0x83, because it uses bulk transfers !\n");
|
|
|
}
|
|
|
break;
|
|
|
case 0x84:
|
|
|
@@ -3576,8 +3565,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
|
|
|
}
|
|
|
|
|
|
printk(KERN_INFO DRIVER_NAME
|
|
|
- ": New device %s %s @ %s Mbps "
|
|
|
- "(%04x:%04x, interface %d, class %d)\n",
|
|
|
+ ": New device %s %s @ %s Mbps (%04x:%04x, interface %d, class %d)\n",
|
|
|
udev->manufacturer ? udev->manufacturer : "",
|
|
|
udev->product ? udev->product : "",
|
|
|
speed,
|
|
|
@@ -3593,8 +3581,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
|
|
|
*/
|
|
|
if (udev->speed != USB_SPEED_HIGH && disable_usb_speed_check == 0) {
|
|
|
printk(DRIVER_NAME ": Device initialization failed.\n");
|
|
|
- printk(DRIVER_NAME ": Device must be connected to a high-speed"
|
|
|
- " USB 2.0 port.\n");
|
|
|
+ printk(DRIVER_NAME ": Device must be connected to a high-speed USB 2.0 port.\n");
|
|
|
retval = -ENODEV;
|
|
|
goto err_free;
|
|
|
}
|