From patchwork Thu May 28 01:10:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 26651 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4S1CUHG027252 for ; Thu, 28 May 2009 01:12:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760880AbZE1BLD (ORCPT ); Wed, 27 May 2009 21:11:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759964AbZE1BLC (ORCPT ); Wed, 27 May 2009 21:11:02 -0400 Received: from sh.osrg.net ([192.16.179.4]:56492 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760100AbZE1BLB (ORCPT ); Wed, 27 May 2009 21:11:01 -0400 Received: from localhost (viola.osrg.net [10.76.0.4]) by sh.osrg.net (8.13.8/8.13.8/OSRG-NET) with ESMTP id n4S1AgTG027736; Thu, 28 May 2009 10:10:43 +0900 Date: Thu, 28 May 2009 10:10:43 +0900 To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [PATCH] vino: replace dma_sync_single with dma_sync_single_for_cpu From: FUJITA Tomonori Mime-Version: 1.0 Message-Id: <20090528100938I.fujita.tomonori@lab.ntt.co.jp> Lines: 32 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 28 May 2009 10:10:43 +0900 (JST) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- drivers/media/video/vino.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 43e0998..97b082f 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -868,9 +868,9 @@ static void vino_sync_buffer(struct vino_framebuffer *fb) 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) */