1 files changed, 33 insertions, 48 deletions

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 375fd85447f8..d59f483102d2 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -856,8 +856,7 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg)
 
         if (dev->tuner_type == TUNER_XC5000) {
                 if (command == XC5000_TUNER_RESET) {
-                        pr_info
-                                ("Tuner CB: RESET: cmd %d : tuner type %d \n",
+                        pr_debug("Tuner CB: RESET: cmd %d : tuner type %d \n",
                                  command, dev->tuner_type);
                         cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
                                                1);
@@ -917,7 +916,7 @@ void cx231xx_pre_card_setup(struct cx231xx *dev)
         cx231xx_set_model(dev);
 
         pr_info("Identified as %s (card=%d)\n",
-                     dev->board.name, dev->model);
+                dev->board.name, dev->model);
 
         /* set the direction for GPIO pins */
         if (dev->board.tuner_gpio) {
@@ -1008,7 +1007,7 @@ static int read_eeprom(struct cx231xx *dev, struct i2c_client *client,
         }
 
         for (i = 0; i + 15 < len; i += 16)
-                pr_info("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);
+                pr_debug("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);
 
         return 0;
 }
@@ -1028,7 +1027,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
                                         cx231xx_get_i2c_adap(dev, I2C_0),
                                         "cx25840", 0x88 >> 1, NULL);
                 if (dev->sd_cx25840 == NULL)
-                        pr_info("cx25840 subdev registration failure\n");
+                        pr_err("cx25840 subdev registration failure\n");
                 cx25840_call(dev, core, load_fw);
 
         }
@@ -1042,7 +1041,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
                                                     "tuner",
                                                     dev->tuner_addr, NULL);
                 if (dev->sd_tuner == NULL)
-                        pr_info("tuner subdev registration failure\n");
+                        pr_err("tuner subdev registration failure\n");
                 else
                         cx231xx_config_tuner(dev);
         }
@@ -1290,21 +1289,19 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         dev->video_mode.end_point_addr = uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress;
         dev->video_mode.num_alt = uif->num_altsetting;
 
-        pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+        pr_info("video EndPoint Addr 0x%x, Alternate settings: %i\n",
                      dev->video_mode.end_point_addr,
                      dev->video_mode.num_alt);
 
         dev->video_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->video_mode.num_alt, GFP_KERNEL);
-        if (dev->video_mode.alt_max_pkt_size == NULL) {
-                pr_err("out of memory!\n");
+        if (dev->video_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->video_mode.num_alt; i++) {
                 u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);
                 dev->video_mode.alt_max_pkt_size[i] = (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                pr_info("Alternate setting %i, max size= %i\n", i,
-                             dev->video_mode.alt_max_pkt_size[i]);
+                pr_debug("Alternate setting %i, max size= %i\n", i,
+                         dev->video_mode.alt_max_pkt_size[i]);
         }
 
         /* VBI Init */
@@ -1321,16 +1318,14 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                         bEndpointAddress;
 
         dev->vbi_mode.num_alt = uif->num_altsetting;
-        pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+        pr_info("VBI EndPoint Addr 0x%x, Alternate settings: %i\n",
                      dev->vbi_mode.end_point_addr,
                      dev->vbi_mode.num_alt);
 
         /* compute alternate max packet sizes for vbi */
         dev->vbi_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->vbi_mode.num_alt, GFP_KERNEL);
-        if (dev->vbi_mode.alt_max_pkt_size == NULL) {
-                pr_err("out of memory!\n");
+        if (dev->vbi_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->vbi_mode.num_alt; i++) {
                 u16 tmp =
@@ -1338,8 +1333,8 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                                 desc.wMaxPacketSize);
                 dev->vbi_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                pr_info("Alternate setting %i, max size= %i\n", i,
-                             dev->vbi_mode.alt_max_pkt_size[i]);
+                pr_debug("Alternate setting %i, max size= %i\n", i,
+                         dev->vbi_mode.alt_max_pkt_size[i]);
         }
 
         /* Sliced CC VBI init */
@@ -1357,23 +1352,20 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                         bEndpointAddress;
 
         dev->sliced_cc_mode.num_alt = uif->num_altsetting;
-        pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                     dev->sliced_cc_mode.end_point_addr,
-                     dev->sliced_cc_mode.num_alt);
+        pr_info("sliced CC EndPoint Addr 0x%x, Alternate settings: %i\n",
+                dev->sliced_cc_mode.end_point_addr,
+                dev->sliced_cc_mode.num_alt);
         dev->sliced_cc_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->sliced_cc_mode.num_alt, GFP_KERNEL);
-
-        if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {
-                pr_err("out of memory!\n");
+        if (dev->sliced_cc_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
                 u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
                                 desc.wMaxPacketSize);
                 dev->sliced_cc_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                pr_info("Alternate setting %i, max size= %i\n", i,
-                             dev->sliced_cc_mode.alt_max_pkt_size[i]);
+                pr_debug("Alternate setting %i, max size= %i\n", i,
+                         dev->sliced_cc_mode.alt_max_pkt_size[i]);
         }
 
         return 0;
@@ -1410,8 +1402,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 nr = find_first_zero_bit(&cx231xx_devused, CX231XX_MAXBOARDS);
                 if (nr >= CX231XX_MAXBOARDS) {
                         /* No free device slots */
-                        pr_err(DRIVER_NAME ": Supports only %i devices.\n",
-                                        CX231XX_MAXBOARDS);
+                        pr_err("Supports only %i devices.\n", CX231XX_MAXBOARDS);
                         return -ENOMEM;
                 }
         } while (test_and_set_bit(nr, &cx231xx_devused));
@@ -1421,7 +1412,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         /* allocate memory for our device state and initialize it */
         dev = devm_kzalloc(&udev->dev, sizeof(*dev), GFP_KERNEL);
         if (dev == NULL) {
-                pr_err(DRIVER_NAME ": out of memory!\n");
                 clear_bit(nr, &cx231xx_devused);
                 return -ENOMEM;
         }
@@ -1468,14 +1458,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 speed = "unknown";
         }
 
-        pr_info("New device %s %s @ %s Mbps "
-             "(%04x:%04x) with %d interfaces\n",
-             udev->manufacturer ? udev->manufacturer : "",
-             udev->product ? udev->product : "",
-             speed,
-             le16_to_cpu(udev->descriptor.idVendor),
-             le16_to_cpu(udev->descriptor.idProduct),
-             dev->max_iad_interface_count);
+        pr_info("New device %s %s @ %s Mbps (%04x:%04x) with %d interfaces\n",
+                udev->manufacturer ? udev->manufacturer : "",
+                udev->product ? udev->product : "",
+                speed,
+                le16_to_cpu(udev->descriptor.idVendor),
+                le16_to_cpu(udev->descriptor.idProduct),
+                dev->max_iad_interface_count);
 
         /* increment interface count */
         dev->interface_count++;
@@ -1485,13 +1474,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
         assoc_desc = udev->actconfig->intf_assoc[0];
         if (assoc_desc->bFirstInterface != ifnum) {
-                pr_err(DRIVER_NAME ": Not found "
-                            "matching IAD interface\n");
+                pr_err("Not found matching IAD interface\n");
                 retval = -ENODEV;
                 goto err_if;
         }
 
-        pr_info("registering interface %d\n", ifnum);
+        pr_debug("registering interface %d\n", ifnum);
 
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, dev);
@@ -1527,13 +1515,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                                 desc.bEndpointAddress;
 
                 dev->ts1_mode.num_alt = uif->num_altsetting;
-                pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
+                pr_info("TS EndPoint Addr 0x%x, Alternate settings: %i\n",
                              dev->ts1_mode.end_point_addr,
                              dev->ts1_mode.num_alt);
 
                 dev->ts1_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->ts1_mode.num_alt, GFP_KERNEL);
                 if (dev->ts1_mode.alt_max_pkt_size == NULL) {
-                        pr_err("out of memory!\n");
                         retval = -ENOMEM;
                         goto err_video_alt;
                 }
@@ -1544,7 +1531,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                                                 wMaxPacketSize);
                         dev->ts1_mode.alt_max_pkt_size[i] =
                             (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                        pr_info("Alternate setting %i, max size= %i\n", i,
+                        pr_debug("Alternate setting %i, max size= %i\n", i,
                                      dev->ts1_mode.alt_max_pkt_size[i]);
                 }
         }
@@ -1609,10 +1596,8 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)
         wake_up_interruptible_all(&dev->open);
 
         if (dev->users) {
-                pr_warn
-                    ("device %s is open! Deregistration and memory "
-                     "deallocation are deferred on close.\n",
-                     video_device_node_name(dev->vdev));
+                pr_warn("device %s is open! Deregistration and memory deallocation are deferred on close.\n",
+                        video_device_node_name(dev->vdev));
 
                 /* Even having users, it is safe to remove the RC i2c driver */
                 cx231xx_ir_exit(dev);