Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Thu, 26 Nov 2009
 08:14:20 -0700
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id nAQFEJlY020507	for
 <andy.sharp@lsi.com>; Thu, 26 Nov 2009 07:14:19 -0800
Received: from psmtp.com (na3sys009amx258.postini.com [74.125.149.142])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id nAQFADbZ006638	for
 <andy.sharp@lsi.com>; Thu, 26 Nov 2009 07:10:14 -0800 (PST)
Received: from source ([78.24.191.182]) by na3sys009amx258.postini.com
 ([74.125.148.14]) with SMTP;	Thu, 26 Nov 2009 07:14:18 PST
Received: from localhost.localdomain ([127.0.0.1]:39775 "EHLO
        eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL)        by
 eddie.linux-mips.org with ESMTP id S1493721AbZKZPOF (ORCPT
        <rfc822;andy.sharp@lsi.com>); Thu, 26 Nov 2009 16:14:05 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 26 Nov 2009 16:13:48
 +0100 (CET)
Received: from cantor.suse.de ([195.135.220.2]:40119 "EHLO mx1.suse.de"
        rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP        id
 S1492899AbZKZPNo (ORCPT <rfc822;linux-mips@linux-mips.org>);        Thu, 26
 Nov 2009 16:13:44 +0100
Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2])
        (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))        (No
 client certificate requested)        by mx1.suse.de (Postfix) with ESMTP id
 0F90E8D893;        Thu, 26 Nov 2009 16:13:44 +0100 (CET)
From: Takashi Iwai <tiwai@suse.de>
To: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
CC: Ralf Baechle <ralf@linux-mips.org>, Wu Zhangjin <wuzhangjin@gmail.com>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Benjamin Herrenschmidt
	<benh@kernel.crashing.org>, Kumar Gala <galak@gate.crashing.org>, Becky Bruce
	<beckyb@kernel.crashing.org>, Takashi Iwai <tiwai@suse.de>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 26 Nov 2009 08:13:05 -0700
Subject: [PATCH 2/5] ALSA: pcm - define snd_pcm_default_page_ops()
Thread-Topic: [PATCH 2/5] ALSA: pcm - define snd_pcm_default_page_ops()
Thread-Index: AcpuqyEay2uGHQ4FQ5yLsyMA1Y2B8w==
Message-ID: <1259248388-20095-3-git-send-email-tiwai@suse.de>
References: <1259248388-20095-1-git-send-email-tiwai@suse.de>
 <1259248388-20095-2-git-send-email-tiwai@suse.de>
In-Reply-To: <1259248388-20095-2-git-send-email-tiwai@suse.de>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <tiwai@suse.de> [22/1] 
x-pstn-neptune: 0/0/0.00/0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Add a helper (inline) function as the default page ops.  Any hacks wrt
the page address conversion will be applied in this function.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/core/pcm_native.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index f067c5b..c906be2 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3062,6 +3062,13 @@ static int snd_pcm_mmap_control(struct snd_pcm_subst=
ream *substream, struct file
 }
 #endif /* coherent mmap */
=20
+static inline struct page *
+snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned lon=
g ofs)
+{
+	void *vaddr =3D substream->runtime->dma_area + ofs;
+	return virt_to_page(vaddr);
+}
+
 /*
  * fault callback for mmapping a RAM page
  */
@@ -3072,7 +3079,6 @@ static int snd_pcm_mmap_data_fault(struct vm_area_str=
uct *area,
 	struct snd_pcm_runtime *runtime;
 	unsigned long offset;
 	struct page * page;
-	void *vaddr;
 	size_t dma_bytes;
 =09
 	if (substream =3D=3D NULL)
@@ -3082,14 +3088,12 @@ static int snd_pcm_mmap_data_fault(struct vm_area_s=
truct *area,
 	dma_bytes =3D PAGE_ALIGN(runtime->dma_bytes);
 	if (offset > dma_bytes - PAGE_SIZE)
 		return VM_FAULT_SIGBUS;
-	if (substream->ops->page) {
+	if (substream->ops->page)
 		page =3D substream->ops->page(substream, offset);
-		if (!page)
-			return VM_FAULT_SIGBUS;
-	} else {
-		vaddr =3D runtime->dma_area + offset;
-		page =3D virt_to_page(vaddr);
-	}
+	else
+		page =3D snd_pcm_default_page_ops(substream, offset);
+	if (!page)
+		return VM_FAULT_SIGBUS;
 	get_page(page);
 	vmf->page =3D page;
 	return 0;
--=20
1.6.5.3


