[2/2] em28xx: Convert printks to em28xx_err and em28xx_info

Commit Message

Filipe Rosset Sept. 28, 2009, 4:19 p.m. UTC

Em 28-09-2009 12:24, Devin Heitmueller escreveu:
> On Mon, Sep 28, 2009 at 11:03 AM, Filipe Rosset <[e-mail]> wrote:
>>
> 
> You should use the em28xx_errdev() instead of em28xx_err() if your
> intent is to insert "dev->name" in front of the message.
> 
> Devin
> 

OK, modified patch.

Filipe

Comments

Devin Heitmueller Sept. 28, 2009, 4:23 p.m. UTC | #1

On Mon, Sep 28, 2009 at 12:19 PM, Filipe Rosset <[e-mail]> wrote:
> Em 28-09-2009 12:24, Devin Heitmueller escreveu:
>> On Mon, Sep 28, 2009 at 11:03 AM, Filipe Rosset <[e-mail]> wrote:
>>>
>>
>> You should use the em28xx_errdev() instead of em28xx_err() if your
>> intent is to insert "dev->name" in front of the message.
>>
>> Devin
>>
>
> OK, modified patch.
>
> Filipe
>

Filipe,

Your updated patch is going to effectively print dev->name twice.
Please look at the definition of em28xx_errdev() and resubmit an
updated patch that takes this into account.

Thanks,

Devin

Patch

diff -r cbf8899e0fd4 linux/drivers/media/video/em28xx/em28xx-dvb.c
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c	Mon Sep 28 11:22:23 2009 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c	Mon Sep 28 12:56:48 2009 -0300
@@ -314,22 +314,22 @@ 
 	cfg.i2c_addr  = addr;
 
 	if (!dev->dvb->frontend) {
-		printk(KERN_ERR "%s/2: dvb frontend not attached. "
+		em28xx_errdev("%s/2: dvb frontend not attached. "
 				"Can't attach xc3028\n",
-		       dev->name);
+			dev->name);
 		return -EINVAL;
 	}
 
 	fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg);
 	if (!fe) {
-		printk(KERN_ERR "%s/2: xc3028 attach failed\n",
-		       dev->name);
+		em28xx_errdev("%s/2: xc3028 attach failed\n",
+			dev->name);
 		dvb_frontend_detach(dev->dvb->frontend);
 		dev->dvb->frontend = NULL;
 		return -EINVAL;
 	}
 
-	printk(KERN_INFO "%s/2: xc3028 attached\n", dev->name);
+	em28xx_info("%s/2: xc3028 attached\n", dev->name);
 
 	return 0;
 }
@@ -464,7 +464,7 @@ 
 	dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL);
 
 	if (dvb == NULL) {
-		printk(KERN_INFO "em28xx_dvb: memory allocation failed\n");
+		em28xx_info("em28xx_dvb: memory allocation failed\n");
 		return -ENOMEM;
 	}
 	dev->dvb = dvb;
@@ -570,15 +570,14 @@ 
 		}
 		break;
 	default:
-		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
+		em28xx_errdev("%s/2: The frontend of your DVB/ATSC card"
 				" isn't supported yet\n",
-		       dev->name);
+			dev->name);
 		break;
 	}
 	if (NULL == dvb->frontend) {
-		printk(KERN_ERR
-		       "%s/2: frontend initialization failed\n",
-		       dev->name);
+		em28xx_errdev("%s/2: frontend initialization failed\n",
+			dev->name);
 		result = -EINVAL;
 		goto out_free;
 	}
@@ -592,7 +591,7 @@ 
 		goto out_free;
 
 	em28xx_set_mode(dev, EM28XX_SUSPEND);
-	printk(KERN_INFO "Successfully loaded em28xx-dvb\n");
+	em28xx_info("Successfully loaded em28xx-dvb\n");
 	return 0;
 
 out_free: