From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753912AbbLVAJx (ORCPT ); Mon, 21 Dec 2015 19:09:53 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:32998 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752146AbbLUXr7 (ORCPT ); Mon, 21 Dec 2015 18:47:59 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 11/83] sound/oss/vidc: keep dma_buf[] as pointers Date: Mon, 21 Dec 2015 23:46:44 +0000 Message-Id: <1450741676-5865-11-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- sound/oss/vidc.c | 8 ++++---- sound/oss/vidc.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index 3196f35..6ab875d 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c @@ -468,13 +468,13 @@ static void __init attach_vidc(struct address_info *hw_config) goto mixer_failed; for (i = 0; i < 2; i++) { - dma_buf[i] = (unsigned long)get_zeroed_page(GFP_KERNEL); + dma_buf[i] = get_zeroed_page(GFP_KERNEL); if (!dma_buf[i]) { printk(KERN_ERR "%s: can't allocate required buffers\n", name); goto mem_failed; } - dma_pbuf[i] = virt_to_phys((void *)dma_buf[i]); + dma_pbuf[i] = virt_to_phys(dma_buf[i]); } if (sound_alloc_dma(hw_config->dma, hw_config->name)) { @@ -497,7 +497,7 @@ irq_failed: dma_failed: mem_failed: for (i = 0; i < 2; i++) - free_page((void *)dma_buf[i]); + free_page(dma_buf[i]); sound_unload_mixerdev(audio_devs[adev]->mixer_dev); mixer_failed: sound_unload_audiodev(adev); @@ -528,7 +528,7 @@ static void __exit unload_vidc(struct address_info *hw_config) sound_unload_mixerdev(audio_devs[adev]->mixer_dev); sound_unload_audiodev(adev); for (i = 0; i < 2; i++) - free_page((void *)dma_buf[i]); + free_page(dma_buf[i]); } } diff --git a/sound/oss/vidc.h b/sound/oss/vidc.h index 0d14247..f079010 100644 --- a/sound/oss/vidc.h +++ b/sound/oss/vidc.h @@ -53,7 +53,8 @@ extern irqreturn_t (*dma_interrupt) (void); */ extern unsigned long dma_start, dma_count, dma_bufsize; -extern unsigned long dma_buf[2], dma_pbuf[2]; +extern unsigned long dma_pbuf[2]; +extern void *dma_buf[2]; /* vidc_synth.c */ -- 2.1.4