[media] staging/media: Use dev_ printks in go7007/s2250-loader.c
fixed below checkpatch warnings. - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... - WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Родитель
6c629edcde
Коммит
b11558a302
|
@ -55,16 +55,16 @@ static int s2250loader_probe(struct usb_interface *interface,
|
|||
|
||||
usbdev = usb_get_dev(interface_to_usbdev(interface));
|
||||
if (!usbdev) {
|
||||
printk(KERN_ERR "Enter s2250loader_probe failed\n");
|
||||
dev_err(&interface->dev, "Enter s2250loader_probe failed\n");
|
||||
return -1;
|
||||
}
|
||||
printk(KERN_INFO "Enter s2250loader_probe 2.6 kernel\n");
|
||||
printk(KERN_INFO "vendor id 0x%x, device id 0x%x devnum:%d\n",
|
||||
usbdev->descriptor.idVendor, usbdev->descriptor.idProduct,
|
||||
usbdev->devnum);
|
||||
dev_info(&interface->dev, "Enter s2250loader_probe 2.6 kernel\n");
|
||||
dev_info(&interface->dev, "vendor id 0x%x, device id 0x%x devnum:%d\n",
|
||||
usbdev->descriptor.idVendor, usbdev->descriptor.idProduct,
|
||||
usbdev->devnum);
|
||||
|
||||
if (usbdev->descriptor.bNumConfigurations != 1) {
|
||||
printk(KERN_ERR "can't handle multiple config\n");
|
||||
dev_err(&interface->dev, "can't handle multiple config\n");
|
||||
return -1;
|
||||
}
|
||||
mutex_lock(&s2250_dev_table_mutex);
|
||||
|
@ -75,31 +75,32 @@ static int s2250loader_probe(struct usb_interface *interface,
|
|||
}
|
||||
|
||||
if (minor < 0 || minor >= MAX_DEVICES) {
|
||||
printk(KERN_ERR "Invalid minor: %d\n", minor);
|
||||
dev_err(&interface->dev, "Invalid minor: %d\n", minor);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/* Allocate dev data structure */
|
||||
s = kmalloc(sizeof(device_extension_t), GFP_KERNEL);
|
||||
if (s == NULL) {
|
||||
printk(KERN_ERR "Out of memory\n");
|
||||
dev_err(&interface->dev, "Out of memory\n");
|
||||
goto failed;
|
||||
}
|
||||
s2250_dev_table[minor] = s;
|
||||
|
||||
printk(KERN_INFO "s2250loader_probe: Device %d on Bus %d Minor %d\n",
|
||||
usbdev->devnum, usbdev->bus->busnum, minor);
|
||||
dev_info(&interface->dev,
|
||||
"s2250loader_probe: Device %d on Bus %d Minor %d\n",
|
||||
usbdev->devnum, usbdev->bus->busnum, minor);
|
||||
|
||||
memset(s, 0, sizeof(device_extension_t));
|
||||
s->usbdev = usbdev;
|
||||
printk(KERN_INFO "loading 2250 loader\n");
|
||||
dev_info(&interface->dev, "loading 2250 loader\n");
|
||||
|
||||
kref_init(&(s->kref));
|
||||
|
||||
mutex_unlock(&s2250_dev_table_mutex);
|
||||
|
||||
if (request_firmware(&fw, S2250_LOADER_FIRMWARE, &usbdev->dev)) {
|
||||
printk(KERN_ERR
|
||||
dev_err(&interface->dev,
|
||||
"s2250: unable to load firmware from file \"%s\"\n",
|
||||
S2250_LOADER_FIRMWARE);
|
||||
goto failed2;
|
||||
|
@ -107,12 +108,12 @@ static int s2250loader_probe(struct usb_interface *interface,
|
|||
ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
|
||||
release_firmware(fw);
|
||||
if (0 != ret) {
|
||||
printk(KERN_ERR "loader download failed\n");
|
||||
dev_err(&interface->dev, "loader download failed\n");
|
||||
goto failed2;
|
||||
}
|
||||
|
||||
if (request_firmware(&fw, S2250_FIRMWARE, &usbdev->dev)) {
|
||||
printk(KERN_ERR
|
||||
dev_err(&interface->dev,
|
||||
"s2250: unable to load firmware from file \"%s\"\n",
|
||||
S2250_FIRMWARE);
|
||||
goto failed2;
|
||||
|
@ -120,7 +121,7 @@ static int s2250loader_probe(struct usb_interface *interface,
|
|||
ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2);
|
||||
release_firmware(fw);
|
||||
if (0 != ret) {
|
||||
printk(KERN_ERR "firmware_s2250 download failed\n");
|
||||
dev_err(&interface->dev, "firmware_s2250 download failed\n");
|
||||
goto failed2;
|
||||
}
|
||||
|
||||
|
@ -133,14 +134,14 @@ failed2:
|
|||
if (s)
|
||||
kref_put(&(s->kref), s2250loader_delete);
|
||||
|
||||
printk(KERN_ERR "probe failed\n");
|
||||
dev_err(&interface->dev, "probe failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void s2250loader_disconnect(struct usb_interface *interface)
|
||||
{
|
||||
pdevice_extension_t s;
|
||||
printk(KERN_INFO "s2250: disconnect\n");
|
||||
dev_info(&interface->dev, "s2250: disconnect\n");
|
||||
s = usb_get_intfdata(interface);
|
||||
usb_set_intfdata(interface, NULL);
|
||||
kref_put(&(s->kref), s2250loader_delete);
|
||||
|
|
Загрузка…
Ссылка в новой задаче