From patchwork Wed Jun 10 19:44:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 1190 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 10 Jun 2009 19:44:40 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 10 Jun 2009 16:46:33 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1METiu-0007eR-8D; Wed, 10 Jun 2009 19:44:40 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758067AbZFJToc (ORCPT + 1 other); Wed, 10 Jun 2009 15:44:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757830AbZFJTob (ORCPT ); Wed, 10 Jun 2009 15:44:31 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:38205 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755988AbZFJTob (ORCPT ); Wed, 10 Jun 2009 15:44:31 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJiLMd029943 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Jun 2009 12:44:22 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n5AJiKW6031741; Wed, 10 Jun 2009 12:44:21 -0700 Message-Id: <200906101944.n5AJiKW6031741@imap1.linux-foundation.org> Subject: [patch 3/6] vino: replace dma_sync_single with dma_sync_single_for_cpu To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, fujita.tomonori@lab.ntt.co.jp From: akpm@linux-foundation.org Date: Wed, 10 Jun 2009 12:44:20 -0700 X-Spam-Status: No, hits=-3.502 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: FUJITA Tomonori This replaces dma_sync_single() with dma_sync_single_for_cpu() because dma_sync_single() is an obsolete API; include/linux/dma-mapping.h says: /* Backwards compat, remove in 2.7.x */ #define dma_sync_single dma_sync_single_for_cpu #define dma_sync_sg dma_sync_sg_for_cpu Signed-off-by: FUJITA Tomonori Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/video/vino.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/media/video/vino.c~vino-replace-dma_sync_single-with-dma_sync_single_for_cpu drivers/media/video/vino.c --- a/drivers/media/video/vino.c~vino-replace-dma_sync_single-with-dma_sync_single_for_cpu +++ a/drivers/media/video/vino.c @@ -868,9 +868,9 @@ static void vino_sync_buffer(struct vino dprintk("vino_sync_buffer():\n"); for (i = 0; i < fb->desc_table.page_count; i++) - dma_sync_single(NULL, - fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i], - PAGE_SIZE, DMA_FROM_DEVICE); + dma_sync_single_for_cpu(NULL, + fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i], + PAGE_SIZE, DMA_FROM_DEVICE); } /* Framebuffer fifo functions (need to be locked externally) */