5 files changed, 4 insertions, 27 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-audio.c b/drivers/media/video/cx231xx/cx231xx-audio.c
index 0027b906f614..9ab0628b9a11 100644
--- a/drivers/media/video/cx231xx/cx231xx-audio.c
+++ b/drivers/media/video/cx231xx/cx231xx-audio.c
@@ -517,7 +517,7 @@ static int cx231xx_audio_init(struct cx231xx *dev)
                         bEndpointAddress);
 
         adev->num_alt = uif->num_altsetting;
-        cx231xx_info(": EndPoint Addr 0x%x, Alternate settings: %i\n",
+        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
                      adev->end_point_addr, adev->num_alt);
         adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);
 
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 8971f35a73e7..d2f2091a58a5 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -224,7 +224,6 @@ void cx231xx_pre_card_setup(struct cx231xx *dev)
         cx231xx_info("Identified as %s (card=%d)\n",
                      dev->board.name, dev->model);
 
-        cx231xx_info("Precard: Board is %s\n", dev->board.name);
         /* set the direction for GPIO pins */
         cx231xx_set_gpio_direction(dev, dev->board.tuner_gpio->bit, 1);
         cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit, 1);
@@ -310,27 +309,11 @@ void cx231xx_card_setup(struct cx231xx *dev)
         if (cx231xx_boards[dev->model].tuner_addr)
                 dev->tuner_addr = cx231xx_boards[dev->model].tuner_addr;
 
-        cx231xx_info(": tuner type %d, tuner address %d \n",
-                     dev->tuner_type, dev->tuner_addr);
-
-        /* Do card specific if any */
-        switch (dev->model) {
-        case CX231XX_BOARD_CNXT_RDE_250:
-                /* do card specific GPIO settings if required */
-                cx231xx_info("Board is Conexant RDE 250\n");
-                break;
-        case CX231XX_BOARD_CNXT_RDU_250:
-                /* do card specific GPIO settings if required */
-                cx231xx_info("Board is Conexant RDU 250\n");
-                break;
-        }
-
         /* request some modules */
         if (dev->board.decoder == CX231XX_AVDECODER) {
-                cx231xx_info(": Requesting cx25840 module\n");
                 dev->sd_cx25840 =
                         v4l2_i2c_new_subdev(&dev->i2c_bus[0].i2c_adap,
-                                "cx25840", "cx25840", 0x88 >> 1);
+                                        "cx25840", "cx25840", 0x88 >> 1);
                 if (dev->sd_cx25840 == NULL)
                         cx231xx_info("cx25840 subdev registration failure\n");
                 cx25840_call(dev, core, init, 0);
@@ -338,7 +321,6 @@ void cx231xx_card_setup(struct cx231xx *dev)
         }
 
         if (dev->board.tuner_type != TUNER_ABSENT) {
-                cx231xx_info(": Requesting Tuner module\n");
                 dev->sd_tuner =
                         v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", 0xc2 >> 1);
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index d0a4d4ddeb8a..0d333e679f70 100644
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -125,7 +125,7 @@ int cx231xx_register_extension(struct cx231xx_ops *ops)
                 if (dev)
                         ops->init(dev);
         }
-        cx231xx_info("Cx231xx: Initialized (%s) extension\n", ops->name);
+        printk(KERN_INFO DRIVER_NAME ": %s initialized\n", ops->name);
         mutex_unlock(&cx231xx_extension_devlist_lock);
         mutex_unlock(&cx231xx_devlist_mutex);
         return 0;
@@ -143,7 +143,7 @@ void cx231xx_unregister_extension(struct cx231xx_ops *ops)
         }
 
         mutex_lock(&cx231xx_extension_devlist_lock);
-        cx231xx_info("Cx231xx: Removed (%s) extension\n", ops->name);
+        printk(KERN_INFO DRIVER_NAME ": %s removed\n", ops->name);
         list_del(&ops->next);
         mutex_unlock(&cx231xx_extension_devlist_lock);
         mutex_unlock(&cx231xx_devlist_mutex);
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
index f95114aa23a1..b4a03d813e00 100644
--- a/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -518,8 +518,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
 
         BUG_ON(!dev->cx231xx_send_usb_command);
 
-        cx231xx_info("%s(bus = %d)\n", __func__, bus->nr);
-
         memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));
         memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));
         memcpy(&bus->i2c_client, &cx231xx_client_template,
@@ -537,7 +535,6 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
         bus->i2c_client.adapter = &bus->i2c_adap;
 
         if (0 == bus->i2c_rc) {
-                cx231xx_info("%s: i2c bus %d registered\n", dev->name, bus->nr);
                 if (i2c_scan)
                         cx231xx_do_i2c_scan(dev, &bus->i2c_client);
         } else
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 9b89a91e0c2a..254d2281bfcd 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -2353,8 +2353,6 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
 {
         int ret;
 
-        cx231xx_info("%s()\n", __func__);
-
         cx231xx_info("%s: v4l2 driver version %d.%d.%d\n",
                      dev->name,
                      (CX231XX_VERSION_CODE >> 16) & 0xff,