diff mbox

[media] V4L/videobuf2-memops: use pr_debug for debug messages

Message ID 1306959563-7108-1-git-send-email-u.kleine-koenig@pengutronix.de (mailing list archive)
State Accepted
Headers show

Commit Message

Uwe Kleine-König June 1, 2011, 8:19 p.m. UTC
Otherwise they clutter the dmesg buffer even on a production kernel.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/media/video/videobuf2-memops.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Comments

Kyungmin Park June 2, 2011, 12:50 a.m. UTC | #1
Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>

---

I think it's better to add the videobuf2 maintainer entry for proper
person to know the changes.
In this case, Marek is missing.

If any objection, I will make a patch.

Thank you,
Kyungmin Park

2011/6/2 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> Otherwise they clutter the dmesg buffer even on a production kernel.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/media/video/videobuf2-memops.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
> index 5370a3a..1987e1b1 100644
> --- a/drivers/media/video/videobuf2-memops.c
> +++ b/drivers/media/video/videobuf2-memops.c
> @@ -177,7 +177,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
>
>        vma->vm_ops->open(vma);
>
> -       printk(KERN_DEBUG "%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
> +       pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
>                        __func__, paddr, vma->vm_start, size);
>
>        return 0;
> @@ -195,7 +195,7 @@ static void vb2_common_vm_open(struct vm_area_struct *vma)
>  {
>        struct vb2_vmarea_handler *h = vma->vm_private_data;
>
> -       printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
> +       pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>               __func__, h, atomic_read(h->refcount), vma->vm_start,
>               vma->vm_end);
>
> @@ -213,7 +213,7 @@ static void vb2_common_vm_close(struct vm_area_struct *vma)
>  {
>        struct vb2_vmarea_handler *h = vma->vm_private_data;
>
> -       printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
> +       pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>               __func__, h, atomic_read(h->refcount), vma->vm_start,
>               vma->vm_end);
>
> --
> 1.7.5.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mauro Carvalho Chehab June 2, 2011, 1:34 a.m. UTC | #2
Hi Kyungmin,

Em 01-06-2011 21:50, Kyungmin Park escreveu:
> Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>

As this patch is really trivial and makes sense, I've just applied it earlier
today.

> ---
> 
> I think it's better to add the videobuf2 maintainer entry for proper
> person to know the changes.
> In this case, Marek is missing.
> 
> If any objection, I will make a patch.

No objections from my side. Having the proper driver maintainers written at MAINTAINERS
help people when submitting patches to send the patch to the proper driver maintainer.

Thanks,
Mauro.

> 
> Thank you,
> Kyungmin Park
> 
> 2011/6/2 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
>> Otherwise they clutter the dmesg buffer even on a production kernel.
>>
>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>> ---
>>  drivers/media/video/videobuf2-memops.c |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
>> index 5370a3a..1987e1b1 100644
>> --- a/drivers/media/video/videobuf2-memops.c
>> +++ b/drivers/media/video/videobuf2-memops.c
>> @@ -177,7 +177,7 @@ int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
>>
>>        vma->vm_ops->open(vma);
>>
>> -       printk(KERN_DEBUG "%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
>> +       pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
>>                        __func__, paddr, vma->vm_start, size);
>>
>>        return 0;
>> @@ -195,7 +195,7 @@ static void vb2_common_vm_open(struct vm_area_struct *vma)
>>  {
>>        struct vb2_vmarea_handler *h = vma->vm_private_data;
>>
>> -       printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>> +       pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>>               __func__, h, atomic_read(h->refcount), vma->vm_start,
>>               vma->vm_end);
>>
>> @@ -213,7 +213,7 @@ static void vb2_common_vm_close(struct vm_area_struct *vma)
>>  {
>>        struct vb2_vmarea_handler *h = vma->vm_private_data;
>>
>> -       printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>> +       pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
>>               __func__, h, atomic_read(h->refcount), vma->vm_start,
>>               vma->vm_end);
>>
>> --
>> 1.7.5.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-media" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marek Szyprowski June 2, 2011, 5:56 a.m. UTC | #3
Hello,

On Thursday, June 02, 2011 3:35 AM Mauro Carvalho Chehab wrote:

> Hi Kyungmin,
> 
> Em 01-06-2011 21:50, Kyungmin Park escreveu:
> > Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
> 
> As this patch is really trivial and makes sense, I've just applied it
> earlier today.

thanks!

> > ---
> >
> > I think it's better to add the videobuf2 maintainer entry for proper
> > person to know the changes.
> > In this case, Marek is missing.
> >
> > If any objection, I will make a patch.
> 
> No objections from my side. Having the proper driver maintainers written at
> MAINTAINERS
> help people when submitting patches to send the patch to the proper driver
> maintainer.

It looks that the patch for MAINTAINERS have been lost. It was initially
posted by Pawel some time ago: https://lkml.org/lkml/2011/3/20/82

I will resend it to linux-media ml.

Best regards
Mauro Carvalho Chehab June 2, 2011, 11:06 a.m. UTC | #4
Em 02-06-2011 02:56, Marek Szyprowski escreveu:
> Hello,
> 
> On Thursday, June 02, 2011 3:35 AM Mauro Carvalho Chehab wrote:
> 
>> Hi Kyungmin,
>>
>> Em 01-06-2011 21:50, Kyungmin Park escreveu:
>>> Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
>>
>> As this patch is really trivial and makes sense, I've just applied it
>> earlier today.
> 
> thanks!
> 
>>> ---
>>>
>>> I think it's better to add the videobuf2 maintainer entry for proper
>>> person to know the changes.
>>> In this case, Marek is missing.
>>>
>>> If any objection, I will make a patch.
>>
>> No objections from my side. Having the proper driver maintainers written at
>> MAINTAINERS
>> help people when submitting patches to send the patch to the proper driver
>> maintainer.
> 
> It looks that the patch for MAINTAINERS have been lost. It was initially
> posted by Pawel some time ago: https://lkml.org/lkml/2011/3/20/82

patchwork.kernel.org is not reliable. I think I'll need to migrate it to
something else.

> I will resend it to linux-media ml.

Thanks!

I noticed that Pawel's SOB is missed at the proposed patch.

Pawel, could you please reply to it with your SOB?

Thanks!
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Uwe Kleine-König June 3, 2011, 7:39 a.m. UTC | #5
Hello Mauro,

On Wed, Jun 01, 2011 at 10:34:31PM -0300, Mauro Carvalho Chehab wrote:
> Hi Kyungmin,
> 
> Em 01-06-2011 21:50, Kyungmin Park escreveu:
> > Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
> 
> As this patch is really trivial and makes sense, I've just applied it earlier
> today.
You somehow screwed up my name in the Author field more than I'm used
to:

 $ git cat-file commit 215c52702775556f4caf5872cc84fa8810e6fc7d | grep Uwe
 author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1306959562 -0300
 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Strange enough my name in the commitlog looks fine.

If you care to fix it, you can easily do so using git filter-branch.
E.g.:

	$ git filter-branch --env-filter 'test "x$GIT_COMMIT" != "x215c52702775556f4caf5872cc84fa8810e6fc7d" || { GIT_AUTHOR_NAME="Uwe Kleine-König"; export GIT_AUTHOR_NAME; }' ^215c5270277^ HEAD

(Assuming an UTF-8 locale.)

This converts 215c527 to a commit c6cbbfc that has my name fixed and
rebases all following commits on top of this. In your master branch this
only affects "00c4526 (Merge /home/v4l/v4l/for_upstream)"

Best regards and thanks
Uwe
Mauro Carvalho Chehab June 3, 2011, 3:39 p.m. UTC | #6
Em 03-06-2011 04:39, Uwe Kleine-König escreveu:
> Hello Mauro,
> 
> On Wed, Jun 01, 2011 at 10:34:31PM -0300, Mauro Carvalho Chehab wrote:
>> Hi Kyungmin,
>>
>> Em 01-06-2011 21:50, Kyungmin Park escreveu:
>>> Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
>>
>> As this patch is really trivial and makes sense, I've just applied it earlier
>> today.
> You somehow screwed up my name in the Author field more than I'm used
> to:
> 
>  $ git cat-file commit 215c52702775556f4caf5872cc84fa8810e6fc7d | grep Uwe
>  author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1306959562 -0300
>  Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Strange enough my name in the commitlog looks fine.

You should thank Python for that. We use patchwork to retrieve patches. It is written
in Python. Python seems to have serious troubles handling anything that it is not pure
ASCII. In the past, a non-north-american name in Patchwork would be simply discarded,
as python used to abort patchwork. Lots of locale-fix patches later trying to address
this issue and now, it sometimes do the right thing.

> 
> If you care to fix it, you can easily do so using git filter-branch.
> E.g.:
> 
> 	$ git filter-branch --env-filter 'test "x$GIT_COMMIT" != "x215c52702775556f4caf5872cc84fa8810e6fc7d" || { GIT_AUTHOR_NAME="Uwe Kleine-König"; export GIT_AUTHOR_NAME; }' ^215c5270277^ HEAD
> 
> (Assuming an UTF-8 locale.)
> 
> This converts 215c527 to a commit c6cbbfc that has my name fixed and
> rebases all following commits on top of this. In your master branch this
> only affects "00c4526 (Merge /home/v4l/v4l/for_upstream)"

This breaks merge. 

$ git push
To /home/v4l/bare_trees/v4l-dvb.git/
 ! [rejected]        staging/for_v3.0 -> staging/for_v3.0 (non-fast-forward)


Fortunately, as the patches on this branch are meant to go to v3.1,
I just renamed the branch to staging/for_v3.1, keeping the wrong patch
at the old branch. This way, the need of rebasing was avoided.

> 
> Best regards and thanks
> Uwe
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Uwe Kleine-König June 3, 2011, 7:50 p.m. UTC | #7
Hello Mauro,

On Fri, Jun 03, 2011 at 12:39:52PM -0300, Mauro Carvalho Chehab wrote:
> Em 03-06-2011 04:39, Uwe Kleine-König escreveu:
> > Hello Mauro,
> > 
> > On Wed, Jun 01, 2011 at 10:34:31PM -0300, Mauro Carvalho Chehab wrote:
> >> Hi Kyungmin,
> >>
> >> Em 01-06-2011 21:50, Kyungmin Park escreveu:
> >>> Acked-by: Kyungmin Park <kyunginn.,park@samsung.com>
> >>
> >> As this patch is really trivial and makes sense, I've just applied it earlier
> >> today.
> > You somehow screwed up my name in the Author field more than I'm used
> > to:
> > 
> >  $ git cat-file commit 215c52702775556f4caf5872cc84fa8810e6fc7d | grep Uwe
> >  author Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 1306959562 -0300
> >  Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > Strange enough my name in the commitlog looks fine.
> 
> You should thank Python for that. We use patchwork to retrieve patches. It is written
> in Python. Python seems to have serious troubles handling anything that it is not pure
> ASCII. In the past, a non-north-american name in Patchwork would be simply discarded,
> as python used to abort patchwork. Lots of locale-fix patches later trying to address
> this issue and now, it sometimes do the right thing.
I added Jeremy Kerr to Cc:, maybe he is interested to look into that.

> > If you care to fix it, you can easily do so using git filter-branch.
> > E.g.:
> > 
> > 	$ git filter-branch --env-filter 'test "x$GIT_COMMIT" != "x215c52702775556f4caf5872cc84fa8810e6fc7d" || { GIT_AUTHOR_NAME="Uwe Kleine-König"; export GIT_AUTHOR_NAME; }' ^215c5270277^ HEAD
> > 
> > (Assuming an UTF-8 locale.)
> > 
> > This converts 215c527 to a commit c6cbbfc that has my name fixed and
> > rebases all following commits on top of this. In your master branch this
> > only affects "00c4526 (Merge /home/v4l/v4l/for_upstream)"
> 
> This breaks merge. 
> 
> $ git push
> To /home/v4l/bare_trees/v4l-dvb.git/
>  ! [rejected]        staging/for_v3.0 -> staging/for_v3.0 (non-fast-forward)
> 
> 
> Fortunately, as the patches on this branch are meant to go to v3.1,
> I just renamed the branch to staging/for_v3.1, keeping the wrong patch
> at the old branch. This way, the need of rebasing was avoided.
I don't get what you mean here. Which merge is broken? Just in case you
didn't know, git push -f should be able to overwrite the remote branch,
with all the downside that brings that with it.

Best regards and thanks
Uwe
Mauro Carvalho Chehab June 3, 2011, 7:56 p.m. UTC | #8
Em 03-06-2011 16:50, Uwe Kleine-König escreveu:
>
>> Fortunately, as the patches on this branch are meant to go to v3.1,
>> I just renamed the branch to staging/for_v3.1, keeping the wrong patch
>> at the old branch. This way, the need of rebasing was avoided.
> I don't get what you mean here. Which merge is broken? Just in case you
> didn't know, git push -f should be able to overwrite the remote branch,
> with all the downside that brings that with it.

A git push -f will cause troubles on all clones of the media tree.

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
index 5370a3a..1987e1b1 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/drivers/media/video/videobuf2-memops.c
@@ -177,7 +177,7 @@  int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
 
 	vma->vm_ops->open(vma);
 
-	printk(KERN_DEBUG "%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
+	pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",
 			__func__, paddr, vma->vm_start, size);
 
 	return 0;
@@ -195,7 +195,7 @@  static void vb2_common_vm_open(struct vm_area_struct *vma)
 {
 	struct vb2_vmarea_handler *h = vma->vm_private_data;
 
-	printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
+	pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
 	       __func__, h, atomic_read(h->refcount), vma->vm_start,
 	       vma->vm_end);
 
@@ -213,7 +213,7 @@  static void vb2_common_vm_close(struct vm_area_struct *vma)
 {
 	struct vb2_vmarea_handler *h = vma->vm_private_data;
 
-	printk(KERN_DEBUG "%s: %p, refcount: %d, vma: %08lx-%08lx\n",
+	pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
 	       __func__, h, atomic_read(h->refcount), vma->vm_start,
 	       vma->vm_end);