From patchwork Fri May 14 01:46:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 3387 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 14 May 2010 01:47:11 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Thu, 13 May 2010 22:49:15 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OCjzb-0004Xz-I4; Fri, 14 May 2010 01:47:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756002Ab0ENBrJ (ORCPT + 1 other); Thu, 13 May 2010 21:47:09 -0400 Received: from sh.osrg.net ([192.16.179.4]:44149 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755027Ab0ENBrI (ORCPT ); Thu, 13 May 2010 21:47:08 -0400 Received: from localhost (rose.osrg.net [10.76.0.1]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4E1kYnq002549; Fri, 14 May 2010 10:46:34 +0900 Date: Fri, 14 May 2010 10:46:34 +0900 To: mchehab@redhat.com Cc: fujita.tomonori@lab.ntt.co.jp, pete@sensoray.com, gregkh@suse.de, linux-media@vger.kernel.org, akpm@linux-foundation.org Subject: Re: [PATCH] Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu From: FUJITA Tomonori In-Reply-To: <4BECA6FD.4000702@redhat.com> References: <1273789524.4502.51.camel@pete-desktop> <20100514094117H.fujita.tomonori@lab.ntt.co.jp> <4BECA6FD.4000702@redhat.com> Mime-Version: 1.0 Message-Id: <20100514104710K.fujita.tomonori@lab.ntt.co.jp> Lines: 67 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Fri, 14 May 2010 10:46:34 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Thu, 13 May 2010 22:27:25 -0300 Mauro Carvalho Chehab wrote: > FUJITA Tomonori wrote: > > On Thu, 13 May 2010 15:25:24 -0700 > > Pete Eberlein 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 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 --- 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)); }