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

Commit Message

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

Em 28-09-2009 13:23, Devin Heitmueller escreveu:
> 
> 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
> 

Hi Devin,

I now resend correct patch.
Sorry for inconvenience.
Thanks,

Filipe

Comments

Devin Heitmueller Sept. 28, 2009, 6:05 p.m. UTC | #1

On Mon, Sep 28, 2009 at 12:43 PM, Filipe Rosset <[e-mail]> wrote:
> Em 28-09-2009 13:23, Devin Heitmueller escreveu:
>>
>> 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
>>
>
> Hi Devin,
>
> I now resend correct patch.
> Sorry for inconvenience.
> Thanks,
>
> Filipe

Hi Felipe,

Sorry, I'm not trying to be difficult, but could you please include
the SOB block in your final patch, as you did with your original
version?  This is required in order for it to be merged upstream.

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 13:37:46 2009 -0300
@@ -314,22 +314,20 @@ 
 	cfg.i2c_addr  = addr;
 
 	if (!dev->dvb->frontend) {
-		printk(KERN_ERR "%s/2: dvb frontend not attached. "
-				"Can't attach xc3028\n",
-		       dev->name);
+		em28xx_errdev("/2: dvb frontend not attached. "
+				"Can't attach xc3028\n");
 		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("/2: xc3028 attach failed\n");
 		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 +462,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 +568,12 @@ 
 		}
 		break;
 	default:
-		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
-				" isn't supported yet\n",
-		       dev->name);
+		em28xx_errdev("/2: The frontend of your DVB/ATSC card"
+				" isn't supported yet\n");
 		break;
 	}
 	if (NULL == dvb->frontend) {
-		printk(KERN_ERR
-		       "%s/2: frontend initialization failed\n",
-		       dev->name);
+		em28xx_errdev("/2: frontend initialization failed\n");
 		result = -EINVAL;
 		goto out_free;
 	}
@@ -592,7 +587,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: