* [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
@ 2009-09-28 15:03 Filipe Rosset
2009-09-28 15:24 ` Devin Heitmueller
0 siblings, 1 reply; 7+ messages in thread
From: Filipe Rosset @ 2009-09-28 15:03 UTC (permalink / raw)
To: linux-media; +Cc: Douglas Schilling Landgraf, Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: Convert_printks_to_em28xx_err_and_em28xx_info.diff --]
[-- Type: text/plain, Size: 2076 bytes --]
em28xx: Convert printks to em28xx_err and em28xx_info
From: Filipe Rosset <rosset.filipe@gmail.com>
Convert printks to em28xx_err and em28xx_info
Priority: normal
Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>
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 11:52:23 2009 -0300
@@ -314,7 +314,7 @@
cfg.i2c_addr = addr;
if (!dev->dvb->frontend) {
- printk(KERN_ERR "%s/2: dvb frontend not attached. "
+ em28xx_err("%s/2: dvb frontend not attached. "
"Can't attach xc3028\n",
dev->name);
return -EINVAL;
@@ -322,14 +322,14 @@
fe = dvb_attach(xc2028_attach, dev->dvb->frontend, &cfg);
if (!fe) {
- printk(KERN_ERR "%s/2: xc3028 attach failed\n",
+ em28xx_err("%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,14 +570,13 @@
}
break;
default:
- printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
+ em28xx_err("%s/2: The frontend of your DVB/ATSC card"
" isn't supported yet\n",
dev->name);
break;
}
if (NULL == dvb->frontend) {
- printk(KERN_ERR
- "%s/2: frontend initialization failed\n",
+ em28xx_err("%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:
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 15:03 [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info Filipe Rosset
@ 2009-09-28 15:24 ` Devin Heitmueller
2009-09-28 16:19 ` Filipe Rosset
0 siblings, 1 reply; 7+ messages in thread
From: Devin Heitmueller @ 2009-09-28 15:24 UTC (permalink / raw)
To: rosset.filipe
Cc: linux-media, Douglas Schilling Landgraf, Mauro Carvalho Chehab
On Mon, Sep 28, 2009 at 11:03 AM, Filipe Rosset <rosset.filipe@gmail.com> 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
--
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 15:24 ` Devin Heitmueller
@ 2009-09-28 16:19 ` Filipe Rosset
2009-09-28 16:23 ` Devin Heitmueller
0 siblings, 1 reply; 7+ messages in thread
From: Filipe Rosset @ 2009-09-28 16:19 UTC (permalink / raw)
To: Devin Heitmueller
Cc: linux-media, Douglas Schilling Landgraf, Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
Em 28-09-2009 12:24, Devin Heitmueller escreveu:
> On Mon, Sep 28, 2009 at 11:03 AM, Filipe Rosset <rosset.filipe@gmail.com> 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
[-- Attachment #2: Convert_printks_to_em28xx_err_and_em28xx_info.diff --]
[-- Type: text/plain, Size: 1917 bytes --]
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:
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 16:19 ` Filipe Rosset
@ 2009-09-28 16:23 ` Devin Heitmueller
2009-09-28 16:43 ` Filipe Rosset
0 siblings, 1 reply; 7+ messages in thread
From: Devin Heitmueller @ 2009-09-28 16:23 UTC (permalink / raw)
To: rosset.filipe
Cc: linux-media, Douglas Schilling Landgraf, Mauro Carvalho Chehab
On Mon, Sep 28, 2009 at 12:19 PM, Filipe Rosset <rosset.filipe@gmail.com> wrote:
> Em 28-09-2009 12:24, Devin Heitmueller escreveu:
>> On Mon, Sep 28, 2009 at 11:03 AM, Filipe Rosset <rosset.filipe@gmail.com> 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
--
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 16:23 ` Devin Heitmueller
@ 2009-09-28 16:43 ` Filipe Rosset
2009-09-28 18:05 ` Devin Heitmueller
0 siblings, 1 reply; 7+ messages in thread
From: Filipe Rosset @ 2009-09-28 16:43 UTC (permalink / raw)
To: Devin Heitmueller; +Cc: linux-media, Douglas Schilling Landgraf
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
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
[-- Attachment #2: Convert_printks_to_em28xx_err_and_em28xx_info.diff --]
[-- Type: text/plain, Size: 1910 bytes --]
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:
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 16:43 ` Filipe Rosset
@ 2009-09-28 18:05 ` Devin Heitmueller
2009-09-28 18:17 ` Filipe Rosset
0 siblings, 1 reply; 7+ messages in thread
From: Devin Heitmueller @ 2009-09-28 18:05 UTC (permalink / raw)
To: rosset.filipe; +Cc: linux-media, Douglas Schilling Landgraf
On Mon, Sep 28, 2009 at 12:43 PM, Filipe Rosset <rosset.filipe@gmail.com> 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
--
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info
2009-09-28 18:05 ` Devin Heitmueller
@ 2009-09-28 18:17 ` Filipe Rosset
0 siblings, 0 replies; 7+ messages in thread
From: Filipe Rosset @ 2009-09-28 18:17 UTC (permalink / raw)
To: Devin Heitmueller; +Cc: linux-media, Douglas Schilling Landgraf
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
Em 28-09-2009 15:05, Devin Heitmueller escreveu:
>
> 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
>
Hi.
Thanks for your tips.
Filipe
[-- Attachment #2: Convert_printks_to_em28xx_err_and_em28xx_info.diff --]
[-- Type: text/plain, Size: 2133 bytes --]
em28xx: Convert printks to em28xx_err and em28xx_info
From: Filipe Rosset <rosset.filipe@gmail.com>
Convert printks to em28xx_err and em28xx_info
Priority: normal
Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>
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:
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-09-28 18:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-28 15:03 [PATCH 2/2] em28xx: Convert printks to em28xx_err and em28xx_info Filipe Rosset
2009-09-28 15:24 ` Devin Heitmueller
2009-09-28 16:19 ` Filipe Rosset
2009-09-28 16:23 ` Devin Heitmueller
2009-09-28 16:43 ` Filipe Rosset
2009-09-28 18:05 ` Devin Heitmueller
2009-09-28 18:17 ` Filipe Rosset
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox