998 obsolete DMA driver interfaces should be removed

Reviewed by: Igor Khozhukhov <igor.khozhukhov@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>

15 files changed, 57 insertions, 294 deletions

diff --git a/usr/src/uts/common/io/1394/nx1394.c b/usr/src/uts/common/io/1394/nx1394.c
index cc710b8417..216b70a319 100644
--- a/usr/src/uts/common/io/1394/nx1394.c
+++ b/usr/src/uts/common/io/1394/nx1394.c
@@ -23,8 +23,9 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * nx1394.c
@@ -72,7 +73,7 @@ struct bus_ops nx1394_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	i_ddi_map_fault,		/* XXXX bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	nx1394_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
@@ -391,7 +392,7 @@ nx1394_add_eventcall(dev_info_t *dip, dev_info_t *rdip,
 #if defined(DEBUG)
 	event_name = ndi_event_cookie_to_name(hal->hal_ndi_event_hdl, cookie);
 	if (event_name == NULL)
-	    event_name = "";
+		event_name = "";
 #endif
 	TNF_PROBE_4_DEBUG(nx1394_add_eventcall_exit, S1394_TNF_SL_NEXUS_STACK,
 	    "", tnf_opaque, parent_dip, (void *)dip, tnf_opaque, requestor_dip,
@@ -430,7 +431,7 @@ nx1394_remove_eventcall(dev_info_t *dip, ddi_callback_id_t cb_id)
 #if defined(DEBUG)
 	event_name = ndi_event_cookie_to_name(hal->hal_ndi_event_hdl, cookie);
 	if (event_name == NULL)
-	    event_name = "";
+		event_name = "";
 
 	TNF_PROBE_4_DEBUG(nx1394_remove_eventcall_exit,
 	    S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, (void *)dip,
diff --git a/usr/src/uts/common/io/blkdev/blkdev.c b/usr/src/uts/common/io/blkdev/blkdev.c
index f7d6cff7a1..7b722f126c 100644
--- a/usr/src/uts/common/io/blkdev/blkdev.c
+++ b/usr/src/uts/common/io/blkdev/blkdev.c
@@ -20,10 +20,8 @@
  */
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-/*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -1680,7 +1678,7 @@ bd_mod_init(struct dev_ops *devops)
 		NULL,			/* bus_add_intrspec (OBSOLETE) */
 		NULL,			/* bus_remove_intrspec (OBSOLETE) */
 		i_ddi_map_fault,	/* bus_map_fault */
-		ddi_dma_map,		/* bus_dma_map */
+		NULL,			/* bus_dma_map (OBSOLETE) */
 		ddi_dma_allochdl,	/* bus_dma_allochdl */
 		ddi_dma_freehdl,	/* bus_dma_freehdl */
 		ddi_dma_bindhdl,	/* bus_dma_bindhdl */
diff --git a/usr/src/uts/common/io/bofi.c b/usr/src/uts/common/io/bofi.c
index 80b69bd07b..6554d29f76 100644
--- a/usr/src/uts/common/io/bofi.c
+++ b/usr/src/uts/common/io/bofi.c
@@ -22,6 +22,9 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 
 #include <sys/types.h>
@@ -161,8 +164,6 @@ static int	bofi_errdef_check_w(struct bofi_errstate *,
 		    struct acc_log_elem **);
 static int	bofi_map(dev_info_t *, dev_info_t *, ddi_map_req_t *,
 		    off_t, off_t, caddr_t *);
-static int	bofi_dma_map(dev_info_t *, dev_info_t *,
-		    struct ddi_dma_req *, ddi_dma_handle_t *);
 static int	bofi_dma_allochdl(dev_info_t *, dev_info_t *,
 		    ddi_dma_attr_t *, int (*)(caddr_t), caddr_t,
 		    ddi_dma_handle_t *);
@@ -209,7 +210,7 @@ static struct bus_ops bofi_bus_ops = {
 	NULL,
 	NULL,
 	i_ddi_map_fault,
-	bofi_dma_map,
+	NULL,
 	bofi_dma_allochdl,
 	bofi_dma_freehdl,
 	bofi_dma_bindhdl,
@@ -3334,174 +3335,6 @@ xbcopy(void *from, void *to, u_longlong_t len)
 
 
 /*
- * our ddi_dma_map routine
- */
-static int
-bofi_dma_map(dev_info_t *dip, dev_info_t *rdip,
-		struct ddi_dma_req *dmareqp, ddi_dma_handle_t *handlep)
-{
-	struct bofi_shadow *hp, *xhp;
-	int maxrnumber = 0;
-	int retval = DDI_DMA_NORESOURCES;
-	auto struct ddi_dma_req dmareq;
-	int sleep;
-	struct bofi_shadow *dhashp;
-	struct bofi_shadow *hhashp;
-	ddi_dma_impl_t *mp;
-	unsigned long pagemask = ddi_ptob(rdip, 1) - 1;
-
-	/*
-	 * if driver_list is set, only intercept those drivers
-	 */
-	if (handlep == NULL || !driver_under_test(rdip))
-		return (save_bus_ops.bus_dma_map(dip, rdip, dmareqp, handlep));
-
-	sleep = (dmareqp->dmar_fp == DDI_DMA_SLEEP) ? KM_SLEEP : KM_NOSLEEP;
-	/*
-	 * allocate shadow handle structure and fill it in
-	 */
-	hp = kmem_zalloc(sizeof (struct bofi_shadow), sleep);
-	if (hp == NULL)
-		goto error;
-	(void) strncpy(hp->name, ddi_get_name(rdip), NAMESIZE);
-	hp->instance = ddi_get_instance(rdip);
-	hp->dip = rdip;
-	hp->flags = dmareqp->dmar_flags;
-	if (dmareqp->dmar_object.dmao_type == DMA_OTYP_PAGES) {
-		hp->map_flags = B_PAGEIO;
-		hp->map_pp = dmareqp->dmar_object.dmao_obj.pp_obj.pp_pp;
-	} else if (dmareqp->dmar_object.dmao_obj.virt_obj.v_priv != NULL) {
-		hp->map_flags = B_SHADOW;
-		hp->map_pplist = dmareqp->dmar_object.dmao_obj.virt_obj.v_priv;
-	} else {
-		hp->map_flags = 0;
-	}
-	hp->link = NULL;
-	hp->type = BOFI_DMA_HDL;
-	/*
-	 * get a kernel virtual mapping
-	 */
-	hp->addr = ddi_dmareq_mapin(dmareqp, &hp->mapaddr, &hp->len);
-	if (hp->addr == NULL)
-		goto error;
-	if (bofi_sync_check) {
-		/*
-		 * Take a copy and pass pointers to this up to nexus instead.
-		 * Data will be copied from the original on explicit
-		 * and implicit ddi_dma_sync()
-		 *
-		 * - maintain page alignment because some devices assume it.
-		 */
-		hp->origaddr = hp->addr;
-		hp->allocaddr = ddi_umem_alloc(
-		    ((uintptr_t)hp->addr & pagemask) + hp->len, sleep,
-		    &hp->umem_cookie);
-		if (hp->allocaddr == NULL)
-			goto error;
-		hp->addr = hp->allocaddr + ((uintptr_t)hp->addr & pagemask);
-		if (dmareqp->dmar_flags & DDI_DMA_WRITE)
-			xbcopy(hp->origaddr, hp->addr, hp->len);
-		dmareq = *dmareqp;
-		dmareq.dmar_object.dmao_size = hp->len;
-		dmareq.dmar_object.dmao_type = DMA_OTYP_VADDR;
-		dmareq.dmar_object.dmao_obj.virt_obj.v_as = &kas;
-		dmareq.dmar_object.dmao_obj.virt_obj.v_addr = hp->addr;
-		dmareq.dmar_object.dmao_obj.virt_obj.v_priv = NULL;
-		dmareqp = &dmareq;
-	}
-	/*
-	 * call nexus to do the real work
-	 */
-	retval = save_bus_ops.bus_dma_map(dip, rdip, dmareqp, handlep);
-	if (retval != DDI_SUCCESS)
-		goto error2;
-	/*
-	 * now set dma_handle to point to real handle
-	 */
-	hp->hdl.dma_handle = *handlep;
-	/*
-	 * unset DMP_NOSYNC
-	 */
-	mp = (ddi_dma_impl_t *)*handlep;
-	mp->dmai_rflags &= ~DMP_NOSYNC;
-	mp->dmai_fault_check = bofi_check_dma_hdl;
-	/*
-	 * bind and unbind are cached in devinfo - must overwrite them
-	 * - note that our bind and unbind are quite happy dealing with
-	 * any handles for this devinfo that were previously allocated
-	 */
-	if (save_bus_ops.bus_dma_bindhdl == DEVI(rdip)->devi_bus_dma_bindfunc)
-		DEVI(rdip)->devi_bus_dma_bindfunc = bofi_dma_bindhdl;
-	if (save_bus_ops.bus_dma_unbindhdl ==
-	    DEVI(rdip)->devi_bus_dma_unbindfunc)
-		DEVI(rdip)->devi_bus_dma_unbindfunc = bofi_dma_unbindhdl;
-	mutex_enter(&bofi_low_mutex);
-	mutex_enter(&bofi_mutex);
-	/*
-	 * get an "rnumber" for this handle - really just seeking to
-	 * get a unique number - generally only care for early allocated
-	 * handles - so we get as far as INT_MAX, just stay there
-	 */
-	dhashp = HDL_DHASH(hp->dip);
-	for (xhp = dhashp->dnext; xhp != dhashp; xhp = xhp->dnext)
-		if (ddi_name_to_major(xhp->name) ==
-		    ddi_name_to_major(hp->name) &&
-		    xhp->instance == hp->instance &&
-		    xhp->type == BOFI_DMA_HDL)
-			if (xhp->rnumber >= maxrnumber) {
-				if (xhp->rnumber == INT_MAX)
-					maxrnumber = INT_MAX;
-				else
-					maxrnumber = xhp->rnumber + 1;
-			}
-	hp->rnumber = maxrnumber;
-	/*
-	 * add to dhash, hhash and inuse lists
-	 */
-	hp->next = shadow_list.next;
-	shadow_list.next->prev = hp;
-	hp->prev = &shadow_list;
-	shadow_list.next = hp;
-	hhashp = HDL_HHASH(*handlep);
-	hp->hnext = hhashp->hnext;
-	hhashp->hnext->hprev = hp;
-	hp->hprev = hhashp;
-	hhashp->hnext = hp;
-	dhashp = HDL_DHASH(hp->dip);
-	hp->dnext = dhashp->dnext;
-	dhashp->dnext->dprev = hp;
-	hp->dprev = dhashp;
-	dhashp->dnext = hp;
-	/*
-	 * chain on any pre-existing errdefs that apply to this
-	 * acc_handle and corrupt if required (as there is an implicit
-	 * ddi_dma_sync() in this call)
-	 */
-	chain_on_errdefs(hp);
-	mutex_exit(&bofi_mutex);
-	mutex_exit(&bofi_low_mutex);
-	return (retval);
-error:
-	if (dmareqp->dmar_fp != DDI_DMA_DONTWAIT) {
-		/*
-		 * what to do here? Wait a bit and try again
-		 */
-		(void) timeout((void (*)())dmareqp->dmar_fp,
-		    dmareqp->dmar_arg, 10);
-	}
-error2:
-	if (hp) {
-		ddi_dmareq_mapout(hp->mapaddr, hp->len, hp->map_flags,
-		    hp->map_pp, hp->map_pplist);
-		if (bofi_sync_check && hp->allocaddr)
-			ddi_umem_free(hp->umem_cookie);
-		kmem_free(hp, sizeof (struct bofi_shadow));
-	}
-	return (retval);
-}
-
-
-/*
  * our ddi_dma_allochdl routine
  */
 static int
@@ -4003,14 +3836,11 @@ bofi_dma_ctl(dev_info_t *dip, dev_info_t *rdip,
 		ddi_dma_handle_t handle, enum ddi_dma_ctlops request,
 		off_t *offp, size_t *lenp, caddr_t *objp, uint_t flags)
 {
-	struct bofi_link *lp, *next_lp;
-	struct bofi_errent *ep;
 	struct bofi_shadow *hp;
 	struct bofi_shadow *hhashp;
 	int retval;
 	int i;
 	struct bofi_shadow *dummyhp;
-	ddi_dma_impl_t *mp;
 
 	/*
 	 * get nexus to do real work
@@ -4089,58 +3919,6 @@ bofi_dma_ctl(dev_info_t *dip, dev_info_t *rdip,
 		    sizeof (struct bofi_shadow *));
 		kmem_free(dummyhp, sizeof (struct bofi_shadow));
 		return (retval);
-	case DDI_DMA_FREE:
-		/*
-		 * ddi_dma_free case - remove from dhash, hhash and inuse lists
-		 */
-		hp->hnext->hprev = hp->hprev;
-		hp->hprev->hnext = hp->hnext;
-		hp->dnext->dprev = hp->dprev;
-		hp->dprev->dnext = hp->dnext;
-		hp->next->prev = hp->prev;
-		hp->prev->next = hp->next;
-		/*
-		 * free any errdef link structures tagged on to this
-		 * shadow handle
-		 */
-		for (lp = hp->link; lp != NULL; ) {
-			next_lp = lp->link;
-			/*
-			 * there is an implicit sync_for_cpu on free -
-			 * may need to corrupt
-			 */
-			ep = lp->errentp;
-			if ((ep->errdef.access_type & BOFI_DMA_R) &&
-			    (hp->flags & DDI_DMA_READ) &&
-			    (ep->state & BOFI_DEV_ACTIVE)) {
-				do_dma_corrupt(hp, ep, DDI_DMA_SYNC_FORCPU,
-				    0, hp->len);
-			}
-			lp->link = bofi_link_freelist;
-			bofi_link_freelist = lp;
-			lp = next_lp;
-		}
-		hp->link = NULL;
-		mutex_exit(&bofi_mutex);
-		mutex_exit(&bofi_low_mutex);
-
-		if (bofi_sync_check && (hp->flags & DDI_DMA_READ))
-			if (hp->allocaddr)
-				xbcopy(hp->addr, hp->origaddr, hp->len);
-		ddi_dmareq_mapout(hp->mapaddr, hp->len, hp->map_flags,
-		    hp->map_pp, hp->map_pplist);
-		if (bofi_sync_check && hp->allocaddr)
-			ddi_umem_free(hp->umem_cookie);
-		kmem_free(hp, sizeof (struct bofi_shadow));
-		return (retval);
-	case DDI_DMA_MOVWIN:
-		mp = (ddi_dma_impl_t *)handle;
-		mp->dmai_rflags &= ~DMP_NOSYNC;
-		break;
-	case DDI_DMA_NEXTWIN:
-		mp = (ddi_dma_impl_t *)handle;
-		mp->dmai_rflags &= ~DMP_NOSYNC;
-		break;
 	default:
 		break;
 	}
diff --git a/usr/src/uts/common/io/fcoe/fcoe.c b/usr/src/uts/common/io/fcoe/fcoe.c
index 5c58dfb01c..f2550c3008 100644
--- a/usr/src/uts/common/io/fcoe/fcoe.c
+++ b/usr/src/uts/common/io/fcoe/fcoe.c
@@ -22,6 +22,9 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * The following notice accompanied the original version of this file:
@@ -156,7 +159,7 @@ static struct bus_ops fcoe_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	i_ddi_map_fault,		/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,		/* bus_dma_allochdl */
 	ddi_dma_freehdl,		/* bus_dma_freehdl */
 	ddi_dma_bindhdl,		/* bus_dma_bindhdl */
diff --git a/usr/src/uts/common/io/fdc.c b/usr/src/uts/common/io/fdc.c
index 444b6b46e5..fdfc73a4fa 100644
--- a/usr/src/uts/common/io/fdc.c
+++ b/usr/src/uts/common/io/fdc.c
@@ -22,6 +22,9 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 
 /*
@@ -214,7 +217,7 @@ struct bus_ops fdc_bus_ops = {
 	0,	/* int 	(*bus_add_intrspec)(); */
 	0,	/* void (*bus_remove_intrspec)(); */
 	i_ddi_map_fault,
-	ddi_dma_map,
+	0,
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/fibre-channel/impl/fctl.c b/usr/src/uts/common/io/fibre-channel/impl/fctl.c
index 747df29d08..634de6c6dd 100644
--- a/usr/src/uts/common/io/fibre-channel/impl/fctl.c
+++ b/usr/src/uts/common/io/fibre-channel/impl/fctl.c
@@ -21,7 +21,11 @@
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
- *
+ */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
+/*
  * Fibre channel Transport Library (fctl)
  *
  * Function naming conventions:
@@ -172,7 +176,7 @@ static struct bus_ops fctl_fca_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	i_ddi_map_fault,		/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,		/* bus_dma_allochdl */
 	ddi_dma_freehdl,		/* bus_dma_freehdl */
 	ddi_dma_bindhdl,		/* bus_dma_bindhdl */
diff --git a/usr/src/uts/common/io/pci-ide/pci-ide.c b/usr/src/uts/common/io/pci-ide/pci-ide.c
index c885fed6a0..7afa702ca4 100644
--- a/usr/src/uts/common/io/pci-ide/pci-ide.c
+++ b/usr/src/uts/common/io/pci-ide/pci-ide.c
@@ -21,7 +21,9 @@
 /*
  * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
  */
-
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  *	PCI-IDE bus nexus driver
@@ -129,7 +131,7 @@ struct bus_ops pciide_bus_ops = {
 	0,
 	0,
 	i_ddi_map_fault,
-	ddi_dma_map,
+	0,
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/pciex/pcieb.c b/usr/src/uts/common/io/pciex/pcieb.c
index 0aba544755..e01f132156 100644
--- a/usr/src/uts/common/io/pciex/pcieb.c
+++ b/usr/src/uts/common/io/pciex/pcieb.c
@@ -21,6 +21,9 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * Common x86 and SPARC PCI-E to PCI bus bridge nexus driver
@@ -96,7 +99,7 @@ static struct bus_ops pcieb_bus_ops = {
 	0,
 	0,
 	i_ddi_map_fault,
-	ddi_dma_map,
+	0,
 	pcieb_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/pshot.c b/usr/src/uts/common/io/pshot.c
index a1d69ea9ae..bc5c328d6b 100644
--- a/usr/src/uts/common/io/pshot.c
+++ b/usr/src/uts/common/io/pshot.c
@@ -22,6 +22,9 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * pseudo bus nexus driver
@@ -305,7 +308,7 @@ static struct bus_ops pshot_bus_ops = {
 	NULL,				/* bus_add_interspec */
 	NULL,				/* bus_remove_interspec */
 	i_ddi_map_fault,		/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,		/* bus_dma_allochdl */
 	ddi_dma_freehdl,		/* bus_dma_freehdl */
 	ddi_dma_bindhdl,		/* bus_dma_bindhdl */
diff --git a/usr/src/uts/common/io/scsi/impl/scsi_hba.c b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
index 6d9c00840f..252bd5316e 100644
--- a/usr/src/uts/common/io/scsi/impl/scsi_hba.c
+++ b/usr/src/uts/common/io/scsi/impl/scsi_hba.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  */
 
 #include <sys/note.h>
@@ -293,7 +294,7 @@ static struct bus_ops scsi_hba_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	scsi_hba_map_fault,		/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,		/* bus_dma_allochdl */
 	ddi_dma_freehdl,		/* bus_dma_freehdl */
 	ddi_dma_bindhdl,		/* bus_dma_bindhdl */
diff --git a/usr/src/uts/common/io/usb/hwa/hwahc/hwahc.c b/usr/src/uts/common/io/usb/hwa/hwahc/hwahc.c
index beba53c65f..9ca1fa0f54 100644
--- a/usr/src/uts/common/io/usb/hwa/hwahc/hwahc.c
+++ b/usr/src/uts/common/io/usb/hwa/hwahc/hwahc.c
@@ -22,6 +22,9 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * The Data Transfer Interface driver for Host Wire Adapter device
@@ -252,7 +255,7 @@ static struct bus_ops hwahc_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	NULL,				/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/usb/usb_ia/usb_ia.c b/usr/src/uts/common/io/usb/usb_ia/usb_ia.c
index 579aae37a7..243b995ed7 100644
--- a/usr/src/uts/common/io/usb/usb_ia/usb_ia.c
+++ b/usr/src/uts/common/io/usb/usb_ia/usb_ia.c
@@ -22,6 +22,9 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 
 /*
@@ -130,7 +133,7 @@ static struct bus_ops usb_ia_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	NULL,				/* XXXX bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/usb/usb_mid/usb_mid.c b/usr/src/uts/common/io/usb/usb_mid/usb_mid.c
index 7c6b507b72..faacf41a79 100644
--- a/usr/src/uts/common/io/usb/usb_mid/usb_mid.c
+++ b/usr/src/uts/common/io/usb/usb_mid/usb_mid.c
@@ -22,6 +22,9 @@
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 
 /*
@@ -142,7 +145,7 @@ static struct bus_ops usb_mid_busops = {
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	NULL,				/* XXXX bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/usb/usba/hubdi.c b/usr/src/uts/common/io/usb/usba/hubdi.c
index 23ab998f0e..de454de41c 100644
--- a/usr/src/uts/common/io/usb/usba/hubdi.c
+++ b/usr/src/uts/common/io/usb/usba/hubdi.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
  */
 
 /*
@@ -112,7 +113,7 @@ struct bus_ops usba_hubdi_busops =	{
 	NULL,				/* bus_add_intrspec */
 	NULL,				/* bus_remove_intrspec */
 	usba_hubdi_map_fault,		/* bus_map_fault */
-	ddi_dma_map,			/* bus_dma_map */
+	NULL,				/* bus_dma_map */
 	ddi_dma_allochdl,
 	ddi_dma_freehdl,
 	ddi_dma_bindhdl,
diff --git a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc b/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
index 4667eddcb0..75e51bdbbb 100644
--- a/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
+++ b/usr/src/uts/common/io/warlock/ddi_dki_comm.inc
@@ -23,7 +23,9 @@
  * All rights reserved.  Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ */
 
 /*
  * ddi_dki_comm.inc - Part of a pseudo-kernel to use when analyzing drivers
@@ -188,22 +190,6 @@ ddi_dma_setup(
 }
 
 int
-ddi_dma_pp_setup(
-	dev_info_t *a,
-	struct page *b,
-	off_t c,
-	uint_t d,
-	uint_t e,
-	int (*fp)(),
-	caddr_t f,
-	ddi_dma_lim_t *g,
-	ddi_dma_handle_t *h)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_map)(0, 0, 0, 0);
-}
-
-int
 ddi_dma_mctl(dev_info_t *a, dev_info_t *b, ddi_dma_handle_t c,
 	enum ddi_dma_ctlops d, off_t *e, size_t *f, caddr_t *g,
 	uint_t h)
@@ -234,35 +220,6 @@ ddi_dma_coff(ddi_dma_handle_t h, ddi_dma_cookie_t *c, off_t *o)
 }
 
 int
-ddi_dma_movwin(ddi_dma_handle_t h, off_t *o, size_t *l, ddi_dma_cookie_t *c)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_curwin(ddi_dma_handle_t h, off_t *o, size_t *l)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_nextwin(register ddi_dma_handle_t h, ddi_dma_win_t win,
-    ddi_dma_win_t *nwin)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
-ddi_dma_nextseg(ddi_dma_win_t win, ddi_dma_seg_t seg, ddi_dma_seg_t *nseg)
-{
-	struct bus_ops *ops;
-	(*ops->bus_dma_ctl)(0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-int
 ddi_dma_get_error(ddi_dma_handle_t h, uint_t len, caddr_t errblk)
 {
 	struct bus_ops *ops;