* [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
@ 2010-05-13 3:45 FUJITA Tomonori
2010-05-13 22:25 ` Pete Eberlein
0 siblings, 1 reply; 5+ messages in thread
From: FUJITA Tomonori @ 2010-05-13 3:45 UTC (permalink / raw)
To: greg, pete, rcohen; +Cc: akpm, linux-kernel
dma_sync_single() is deprecated and will be removed soon.
No functional change since dma_sync_single is the wrapper of
dma_sync_single_for_cpu.
saa7134-go7007.c is commented out but anyway let's replace it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
drivers/staging/go7007/saa7134-go7007.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
index b25d7d2..0d36ce7 100644
--- a/drivers/staging/go7007/saa7134-go7007.c
+++ b/drivers/staging/go7007/saa7134-go7007.c
@@ -242,13 +242,13 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",
(status >> 16) & 0x0f);
if (status & 0x100000) {
- dma_sync_single(&dev->pci->dev,
- saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
+ dma_sync_single_for_cpu(&dev->pci->dev,
+ saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
} else {
- dma_sync_single(&dev->pci->dev,
- saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
+ dma_sync_single_for_cpu(&dev->pci->dev,
+ saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
}
--
1.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
2010-05-13 3:45 [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu FUJITA Tomonori
@ 2010-05-13 22:25 ` Pete Eberlein
2010-05-14 0:40 ` FUJITA Tomonori
0 siblings, 1 reply; 5+ messages in thread
From: Pete Eberlein @ 2010-05-13 22:25 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: linux-media@vger.kernel.org
Thanks, Tomonori.
Does this need to get submitted to the linux-media tree as well, or will
this patch get pulled automatically from Linus' tree?
Thanks,
Pete Eberlein
On Thu, 2010-05-13 at 12:45 +0900, FUJITA Tomonori wrote:
> dma_sync_single() is deprecated and will be removed soon.
>
> No functional change since dma_sync_single is the wrapper of
> dma_sync_single_for_cpu.
>
> saa7134-go7007.c is commented out but anyway let's replace it.
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> ---
> drivers/staging/go7007/saa7134-go7007.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
> index b25d7d2..0d36ce7 100644
> --- a/drivers/staging/go7007/saa7134-go7007.c
> +++ b/drivers/staging/go7007/saa7134-go7007.c
> @@ -242,13 +242,13 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
> printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",
> (status >> 16) & 0x0f);
> if (status & 0x100000) {
> - dma_sync_single(&dev->pci->dev,
> - saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> + dma_sync_single_for_cpu(&dev->pci->dev,
> + saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
> saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
> } else {
> - dma_sync_single(&dev->pci->dev,
> - saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> + dma_sync_single_for_cpu(&dev->pci->dev,
> + saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
> saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
> }
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
2010-05-13 22:25 ` Pete Eberlein
@ 2010-05-14 0:40 ` FUJITA Tomonori
2010-05-14 1:27 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 5+ messages in thread
From: FUJITA Tomonori @ 2010-05-14 0:40 UTC (permalink / raw)
To: pete, gregkh; +Cc: fujita.tomonori, linux-media, akpm
On Thu, 13 May 2010 15:25:24 -0700
Pete Eberlein <pete@sensoray.com> wrote:
> Thanks, Tomonori.
>
> Does this need to get submitted to the linux-media tree as well, or will
> this patch get pulled automatically from Linus' tree?
I think that patches for staging drivers are merged via Greg's staging
tree.
> Thanks,
> Pete Eberlein
>
> On Thu, 2010-05-13 at 12:45 +0900, FUJITA Tomonori wrote:
> > dma_sync_single() is deprecated and will be removed soon.
> >
> > No functional change since dma_sync_single is the wrapper of
> > dma_sync_single_for_cpu.
> >
> > saa7134-go7007.c is commented out but anyway let's replace it.
> >
> > Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> > ---
> > drivers/staging/go7007/saa7134-go7007.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
> > index b25d7d2..0d36ce7 100644
> > --- a/drivers/staging/go7007/saa7134-go7007.c
> > +++ b/drivers/staging/go7007/saa7134-go7007.c
> > @@ -242,13 +242,13 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
> > printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",
> > (status >> 16) & 0x0f);
> > if (status & 0x100000) {
> > - dma_sync_single(&dev->pci->dev,
> > - saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> > + dma_sync_single_for_cpu(&dev->pci->dev,
> > + saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> > go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
> > saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
> > } else {
> > - dma_sync_single(&dev->pci->dev,
> > - saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> > + dma_sync_single_for_cpu(&dev->pci->dev,
> > + saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
> > go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
> > saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
> > }
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
2010-05-14 0:40 ` FUJITA Tomonori
@ 2010-05-14 1:27 ` Mauro Carvalho Chehab
2010-05-14 1:46 ` FUJITA Tomonori
0 siblings, 1 reply; 5+ messages in thread
From: Mauro Carvalho Chehab @ 2010-05-14 1:27 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: pete, gregkh, linux-media, akpm
FUJITA Tomonori wrote:
> On Thu, 13 May 2010 15:25:24 -0700
> Pete Eberlein <pete@sensoray.com> wrote:
>
>> Thanks, Tomonori.
>>
>> Does this need to get submitted to the linux-media tree as well, or will
>> this patch get pulled automatically from Linus' tree?
>
> I think that patches for staging drivers are merged via Greg's staging
> tree.
In the specific case of staging drivers for go7007, tm6000 and cx25821,
those patches are going via v4l-dvb git tree.
>
>
>> Thanks,
>> Pete Eberlein
>>
>> On Thu, 2010-05-13 at 12:45 +0900, FUJITA Tomonori wrote:
>>> dma_sync_single() is deprecated and will be removed soon.
>>>
>>> No functional change since dma_sync_single is the wrapper of
>>> dma_sync_single_for_cpu.
>>>
>>> saa7134-go7007.c is commented out but anyway let's replace it.
>>>
>>> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
>>> ---
>>> drivers/staging/go7007/saa7134-go7007.c | 8 ++++----
>>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
>>> index b25d7d2..0d36ce7 100644
>>> --- a/drivers/staging/go7007/saa7134-go7007.c
>>> +++ b/drivers/staging/go7007/saa7134-go7007.c
>>> @@ -242,13 +242,13 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
>>> printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",
>>> (status >> 16) & 0x0f);
>>> if (status & 0x100000) {
>>> - dma_sync_single(&dev->pci->dev,
>>> - saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
>>> + dma_sync_single_for_cpu(&dev->pci->dev,
>>> + saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
>>> go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
>>> saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
>>> } else {
>>> - dma_sync_single(&dev->pci->dev,
>>> - saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
>>> + dma_sync_single_for_cpu(&dev->pci->dev,
>>> + saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
>>> go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
>>> saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
>>> }
>>
>>
>>
> --
> 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
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
2010-05-14 1:27 ` Mauro Carvalho Chehab
@ 2010-05-14 1:46 ` FUJITA Tomonori
0 siblings, 0 replies; 5+ messages in thread
From: FUJITA Tomonori @ 2010-05-14 1:46 UTC (permalink / raw)
To: mchehab; +Cc: fujita.tomonori, pete, gregkh, linux-media, akpm
On Thu, 13 May 2010 22:27:25 -0300
Mauro Carvalho Chehab <mchehab@redhat.com> wrote:
> FUJITA Tomonori wrote:
> > On Thu, 13 May 2010 15:25:24 -0700
> > Pete Eberlein <pete@sensoray.com> wrote:
> >
> >> Thanks, Tomonori.
> >>
> >> Does this need to get submitted to the linux-media tree as well, or will
> >> this patch get pulled automatically from Linus' tree?
> >
> > I think that patches for staging drivers are merged via Greg's staging
> > tree.
>
> In the specific case of staging drivers for go7007, tm6000 and cx25821,
> those patches are going via v4l-dvb git tree.
I see, now I resend the patch to linux-media.
For further information about the background:
http://marc.info/?t=127354052400002&r=1&w=2
Thanks,
=
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu
dma_sync_single() is deprecated and will be removed soon.
No functional change since dma_sync_single is the wrapper of
dma_sync_single_for_cpu.
saa7134-go7007.c is commented out but anyway let's replace it.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
drivers/staging/go7007/saa7134-go7007.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/go7007/saa7134-go7007.c b/drivers/staging/go7007/saa7134-go7007.c
index b25d7d2..0d36ce7 100644
--- a/drivers/staging/go7007/saa7134-go7007.c
+++ b/drivers/staging/go7007/saa7134-go7007.c
@@ -242,13 +242,13 @@ static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
printk(KERN_DEBUG "saa7134-go7007: irq: lost %ld\n",
(status >> 16) & 0x0f);
if (status & 0x100000) {
- dma_sync_single(&dev->pci->dev,
- saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
+ dma_sync_single_for_cpu(&dev->pci->dev,
+ saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
} else {
- dma_sync_single(&dev->pci->dev,
- saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
+ dma_sync_single_for_cpu(&dev->pci->dev,
+ saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
}
--
1.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-05-14 1:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-13 3:45 [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu FUJITA Tomonori
2010-05-13 22:25 ` Pete Eberlein
2010-05-14 0:40 ` FUJITA Tomonori
2010-05-14 1:27 ` Mauro Carvalho Chehab
2010-05-14 1:46 ` FUJITA Tomonori
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.