svn commit: r252666 - stable/9/sys/dev/nvme

[Jim Harris]

Author: jimharris
Date: Wed Jul  3 23:59:08 2013
New Revision: 252666
URL: http://svnweb.freebsd.org/changeset/base/252666

Log:
  MFC r252273:
  
    Remove remaining uio-related code.
  
    The nvme_physio() function was removed quite a while ago, which was the
    only user of this uio-related code.
  
  Sponsored by: Intel

Modified:
  stable/9/sys/dev/nvme/nvme_private.h
  stable/9/sys/dev/nvme/nvme_qpair.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/nvme/nvme_private.h
==============================================================================
--- stable/9/sys/dev/nvme/nvme_private.h	Wed Jul  3 23:58:09 2013	(r252665)
+++ stable/9/sys/dev/nvme/nvme_private.h	Wed Jul  3 23:59:08 2013	(r252666)
@@ -145,7 +145,6 @@ struct nvme_request {
 	struct nvme_qpair		*qpair;
 	union {
 		void			*payload;
-		struct uio		*uio;
 		struct bio		*bio;
 	} u;
 	uint32_t			type;
@@ -469,8 +468,6 @@ int	nvme_ns_construct(struct nvme_namesp
 			  struct nvme_controller *ctrlr);
 void	nvme_ns_destruct(struct nvme_namespace *ns);
 
-int	nvme_ns_physio(struct cdev *dev, struct uio *uio, int ioflag);
-
 void	nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr);
 
 void	nvme_dump_command(struct nvme_command *cmd);
@@ -525,19 +522,6 @@ nvme_allocate_request_null(nvme_cb_fn_t 
 }
 
 static __inline struct nvme_request *
-nvme_allocate_request_uio(struct uio *uio, nvme_cb_fn_t cb_fn, void *cb_arg)
-{
-	struct nvme_request *req;
-
-	req = _nvme_allocate_request(cb_fn, cb_arg);
-	if (req != NULL) {
-		req->type = NVME_REQUEST_UIO;
-		req->u.uio = uio;
-	}
-	return (req);
-}
-
-static __inline struct nvme_request *
 nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg)
 {
 	struct nvme_request *req;

Modified: stable/9/sys/dev/nvme/nvme_qpair.c
==============================================================================
--- stable/9/sys/dev/nvme/nvme_qpair.c	Wed Jul  3 23:58:09 2013	(r252665)
+++ stable/9/sys/dev/nvme/nvme_qpair.c	Wed Jul  3 23:59:08 2013	(r252666)
@@ -735,14 +735,6 @@ nvme_payload_map(void *arg, bus_dma_segm
 }
 
 static void
-nvme_payload_map_uio(void *arg, bus_dma_segment_t *seg, int nseg,
-    bus_size_t mapsize, int error)
-{
-
-	nvme_payload_map(arg, seg, nseg, error);
-}
-
-static void
 _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
 {
 	struct nvme_tracker	*tr;
@@ -798,14 +790,6 @@ _nvme_qpair_submit_request(struct nvme_q
 	case NVME_REQUEST_NULL:
 		nvme_qpair_submit_tracker(tr->qpair, tr);
 		break;
-	case NVME_REQUEST_UIO:
-		err = bus_dmamap_load_uio(tr->qpair->dma_tag,
-		    tr->payload_dma_map, req->u.uio, nvme_payload_map_uio,
-		    tr, 0);
-		if (err != 0)
-			nvme_printf(qpair->ctrlr,
-			    "bus_dmamap_load_uio returned 0x%x!\n", err);
-		break;
 #ifdef NVME_UNMAPPED_BIO_SUPPORT
 	case NVME_REQUEST_BIO:
 		KASSERT(req->u.bio->bio_bcount <= qpair->ctrlr->max_xfer_size,