diff options
| author | YAMANE Toshiaki <yamanetoshi@gmail.com> | 2012-11-05 05:34:42 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-21 15:40:21 -0500 |
| commit | b11558a3026bd01436d08b7b8f92da301116c669 (patch) | |
| tree | ac97022e95220dedb7c36fb5676131e8e56e1b19 /drivers/staging | |
| parent | 6c629edcde1610635a7af93dbb181d5081afc194 (diff) | |
[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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/go7007/s2250-loader.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/drivers/staging/media/go7007/s2250-loader.c b/drivers/staging/media/go7007/s2250-loader.c index f1bd159ac195..f57eb3beb341 100644 --- a/drivers/staging/media/go7007/s2250-loader.c +++ b/drivers/staging/media/go7007/s2250-loader.c | |||
| @@ -55,16 +55,16 @@ static int s2250loader_probe(struct usb_interface *interface, | |||
| 55 | 55 | ||
| 56 | usbdev = usb_get_dev(interface_to_usbdev(interface)); | 56 | usbdev = usb_get_dev(interface_to_usbdev(interface)); |
| 57 | if (!usbdev) { | 57 | if (!usbdev) { |
| 58 | printk(KERN_ERR "Enter s2250loader_probe failed\n"); | 58 | dev_err(&interface->dev, "Enter s2250loader_probe failed\n"); |
| 59 | return -1; | 59 | return -1; |
| 60 | } | 60 | } |
| 61 | printk(KERN_INFO "Enter s2250loader_probe 2.6 kernel\n"); | 61 | dev_info(&interface->dev, "Enter s2250loader_probe 2.6 kernel\n"); |
| 62 | printk(KERN_INFO "vendor id 0x%x, device id 0x%x devnum:%d\n", | 62 | dev_info(&interface->dev, "vendor id 0x%x, device id 0x%x devnum:%d\n", |
| 63 | usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, | 63 | usbdev->descriptor.idVendor, usbdev->descriptor.idProduct, |
| 64 | usbdev->devnum); | 64 | usbdev->devnum); |
| 65 | 65 | ||
| 66 | if (usbdev->descriptor.bNumConfigurations != 1) { | 66 | if (usbdev->descriptor.bNumConfigurations != 1) { |
| 67 | printk(KERN_ERR "can't handle multiple config\n"); | 67 | dev_err(&interface->dev, "can't handle multiple config\n"); |
| 68 | return -1; | 68 | return -1; |
| 69 | } | 69 | } |
| 70 | mutex_lock(&s2250_dev_table_mutex); | 70 | mutex_lock(&s2250_dev_table_mutex); |
| @@ -75,31 +75,32 @@ static int s2250loader_probe(struct usb_interface *interface, | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (minor < 0 || minor >= MAX_DEVICES) { | 77 | if (minor < 0 || minor >= MAX_DEVICES) { |
| 78 | printk(KERN_ERR "Invalid minor: %d\n", minor); | 78 | dev_err(&interface->dev, "Invalid minor: %d\n", minor); |
| 79 | goto failed; | 79 | goto failed; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | /* Allocate dev data structure */ | 82 | /* Allocate dev data structure */ |
| 83 | s = kmalloc(sizeof(device_extension_t), GFP_KERNEL); | 83 | s = kmalloc(sizeof(device_extension_t), GFP_KERNEL); |
| 84 | if (s == NULL) { | 84 | if (s == NULL) { |
| 85 | printk(KERN_ERR "Out of memory\n"); | 85 | dev_err(&interface->dev, "Out of memory\n"); |
| 86 | goto failed; | 86 | goto failed; |
| 87 | } | 87 | } |
| 88 | s2250_dev_table[minor] = s; | 88 | s2250_dev_table[minor] = s; |
| 89 | 89 | ||
| 90 | printk(KERN_INFO "s2250loader_probe: Device %d on Bus %d Minor %d\n", | 90 | dev_info(&interface->dev, |
| 91 | usbdev->devnum, usbdev->bus->busnum, minor); | 91 | "s2250loader_probe: Device %d on Bus %d Minor %d\n", |
| 92 | usbdev->devnum, usbdev->bus->busnum, minor); | ||
| 92 | 93 | ||
| 93 | memset(s, 0, sizeof(device_extension_t)); | 94 | memset(s, 0, sizeof(device_extension_t)); |
| 94 | s->usbdev = usbdev; | 95 | s->usbdev = usbdev; |
| 95 | printk(KERN_INFO "loading 2250 loader\n"); | 96 | dev_info(&interface->dev, "loading 2250 loader\n"); |
| 96 | 97 | ||
| 97 | kref_init(&(s->kref)); | 98 | kref_init(&(s->kref)); |
| 98 | 99 | ||
| 99 | mutex_unlock(&s2250_dev_table_mutex); | 100 | mutex_unlock(&s2250_dev_table_mutex); |
| 100 | 101 | ||
| 101 | if (request_firmware(&fw, S2250_LOADER_FIRMWARE, &usbdev->dev)) { | 102 | if (request_firmware(&fw, S2250_LOADER_FIRMWARE, &usbdev->dev)) { |
| 102 | printk(KERN_ERR | 103 | dev_err(&interface->dev, |
| 103 | "s2250: unable to load firmware from file \"%s\"\n", | 104 | "s2250: unable to load firmware from file \"%s\"\n", |
| 104 | S2250_LOADER_FIRMWARE); | 105 | S2250_LOADER_FIRMWARE); |
| 105 | goto failed2; | 106 | goto failed2; |
| @@ -107,12 +108,12 @@ static int s2250loader_probe(struct usb_interface *interface, | |||
| 107 | ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); | 108 | ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); |
| 108 | release_firmware(fw); | 109 | release_firmware(fw); |
| 109 | if (0 != ret) { | 110 | if (0 != ret) { |
| 110 | printk(KERN_ERR "loader download failed\n"); | 111 | dev_err(&interface->dev, "loader download failed\n"); |
| 111 | goto failed2; | 112 | goto failed2; |
| 112 | } | 113 | } |
| 113 | 114 | ||
| 114 | if (request_firmware(&fw, S2250_FIRMWARE, &usbdev->dev)) { | 115 | if (request_firmware(&fw, S2250_FIRMWARE, &usbdev->dev)) { |
| 115 | printk(KERN_ERR | 116 | dev_err(&interface->dev, |
| 116 | "s2250: unable to load firmware from file \"%s\"\n", | 117 | "s2250: unable to load firmware from file \"%s\"\n", |
| 117 | S2250_FIRMWARE); | 118 | S2250_FIRMWARE); |
| 118 | goto failed2; | 119 | goto failed2; |
| @@ -120,7 +121,7 @@ static int s2250loader_probe(struct usb_interface *interface, | |||
| 120 | ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); | 121 | ret = usb_cypress_load_firmware(usbdev, fw, CYPRESS_FX2); |
| 121 | release_firmware(fw); | 122 | release_firmware(fw); |
| 122 | if (0 != ret) { | 123 | if (0 != ret) { |
| 123 | printk(KERN_ERR "firmware_s2250 download failed\n"); | 124 | dev_err(&interface->dev, "firmware_s2250 download failed\n"); |
| 124 | goto failed2; | 125 | goto failed2; |
| 125 | } | 126 | } |
| 126 | 127 | ||
| @@ -133,14 +134,14 @@ failed2: | |||
| 133 | if (s) | 134 | if (s) |
| 134 | kref_put(&(s->kref), s2250loader_delete); | 135 | kref_put(&(s->kref), s2250loader_delete); |
| 135 | 136 | ||
| 136 | printk(KERN_ERR "probe failed\n"); | 137 | dev_err(&interface->dev, "probe failed\n"); |
| 137 | return -1; | 138 | return -1; |
| 138 | } | 139 | } |
| 139 | 140 | ||
| 140 | static void s2250loader_disconnect(struct usb_interface *interface) | 141 | static void s2250loader_disconnect(struct usb_interface *interface) |
| 141 | { | 142 | { |
| 142 | pdevice_extension_t s; | 143 | pdevice_extension_t s; |
| 143 | printk(KERN_INFO "s2250: disconnect\n"); | 144 | dev_info(&interface->dev, "s2250: disconnect\n"); |
| 144 | s = usb_get_intfdata(interface); | 145 | s = usb_get_intfdata(interface); |
| 145 | usb_set_intfdata(interface, NULL); | 146 | usb_set_intfdata(interface, NULL); |
| 146 | kref_put(&(s->kref), s2250loader_delete); | 147 | kref_put(&(s->kref), s2250loader_delete); |
