From owner-svn-src-head@FreeBSD.ORG Sun Feb 8 08:13:36 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B5B0106566C; Sun, 8 Feb 2009 08:13:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49A748FC0C; Sun, 8 Feb 2009 08:13:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n188Dao4016089; Sun, 8 Feb 2009 08:13:36 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n188DaPV016088; Sun, 8 Feb 2009 08:13:36 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200902080813.n188DaPV016088@svn.freebsd.org> From: Warner Losh Date: Sun, 8 Feb 2009 08:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188304 - head/sys/mips/mips X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Feb 2009 08:13:36 -0000 Author: imp Date: Sun Feb 8 08:13:36 2009 New Revision: 188304 URL: http://svn.freebsd.org/changeset/base/188304 Log: Retire NO_DMA completely. Modified: head/sys/mips/mips/busdma_machdep.c Modified: head/sys/mips/mips/busdma_machdep.c ============================================================================== --- head/sys/mips/mips/busdma_machdep.c Sun Feb 8 07:05:23 2009 (r188303) +++ head/sys/mips/mips/busdma_machdep.c Sun Feb 8 08:13:36 2009 (r188304) @@ -187,7 +187,6 @@ busdma_lock_mutex(void *arg, bus_dma_loc * with the tag are meant to never be defered. * XXX Should have a way to identify which driver is responsible here. */ -#ifndef NO_DMA static void dflt_lock(void *arg, bus_dma_lock_op_t op) { @@ -197,7 +196,6 @@ dflt_lock(void *arg, bus_dma_lock_op_t o printf("DRIVER_ERROR: busdma dflt_lock called\n"); #endif } -#endif static __inline bus_dmamap_t _busdma_alloc_dmamap(void) @@ -238,7 +236,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat) { -#ifndef NO_DMA bus_dma_tag_t newtag; int error = 0; @@ -313,10 +310,6 @@ bus_dma_tag_create(bus_dma_tag_t parent, CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", __func__, newtag, (newtag != NULL ? newtag->flags : 0), error); return (error); -#else - return ENOSYS; -#endif - } int