White space cleanup

1 files changed, 66 insertions, 70 deletions

diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index d0583cb..7c925d0 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -258,7 +258,7 @@ static int
 ciss_lookup(device_t dev)
 {
     int 	i;
-    
+
     for (i = 0; ciss_vendor_data[i].desc != NULL; i++)
 	if ((pci_get_subvendor(dev) == ciss_vendor_data[i].subvendor) &&
 	    (pci_get_subdevice(dev) == ciss_vendor_data[i].subdevice)) {
@@ -274,7 +274,7 @@ static int
 ciss_probe(device_t dev)
 {
     int		i;
-    
+
     i = ciss_lookup(dev);
     if (i != -1) {
 	device_set_desc(dev, ciss_vendor_data[i].desc);
@@ -483,7 +483,7 @@ ciss_init_pci(struct ciss_softc *sc)
     }
     sc->ciss_regs_bhandle = rman_get_bushandle(sc->ciss_regs_resource);
     sc->ciss_regs_btag = rman_get_bustag(sc->ciss_regs_resource);
-    
+
     /*
      * Find the BAR holding the config structure.  If it's not the one
      * we already mapped for registers, map it too.
@@ -637,7 +637,7 @@ ciss_wait_adapter(struct ciss_softc *sc)
     int		i;
 
     debug_called(1);
-    
+
     /*
      * Wait for the adapter to come ready.
      */
@@ -689,7 +689,7 @@ ciss_flush_adapter(struct ciss_softc *sc)
 	ciss_printf(sc, "error sending BMIC FLUSH_CACHE command (%d)\n", error);
 	goto out;
     }
-    
+
     /*
      * Check response.
      */
@@ -726,13 +726,13 @@ ciss_init_requests(struct ciss_softc *sc)
     int			i;
 
     debug_called(1);
-    
+
     /*
      * Calculate the number of request structures/commands we are
      * going to provide for this adapter.
      */
     sc->ciss_max_requests = min(CISS_MAX_REQUESTS, sc->ciss_cfg->max_outstanding_commands);
-    
+
     if (bootverbose)
 	ciss_printf(sc, "using %d of %d available commands\n",
 		    sc->ciss_max_requests, sc->ciss_cfg->max_outstanding_commands);
@@ -817,7 +817,7 @@ ciss_identify_adapter(struct ciss_softc *sc)
 	ciss_printf(sc, "error sending BMIC ID_CTLR command (%d)\n", error);
 	goto out;
     }
-    
+
     /*
      * Check response.
      */
@@ -849,7 +849,7 @@ ciss_identify_adapter(struct ciss_softc *sc)
 
     /* XXX only really required for old 5300 adapters? */
     sc->ciss_flags |= CISS_FLAG_BMIC_ABORT;
-    
+
     /* print information */
     if (bootverbose) {
 	ciss_printf(sc, "  %d logical drive%s configured\n",
@@ -930,7 +930,7 @@ ciss_init_logical(struct ciss_softc *sc)
     cr->cr_data = cll;
     cr->cr_length = report_size;
     cr->cr_flags = CISS_REQ_DATAIN;
-    
+
     cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
     cc->header.address.physical.bus = 0;
     cc->header.address.physical.target = 0;
@@ -945,7 +945,7 @@ ciss_init_logical(struct ciss_softc *sc)
     crc->opcode = CISS_OPCODE_REPORT_LOGICAL_LUNS;
     crc->length = htonl(report_size);			/* big-endian field */
     cll->list_size = htonl(report_size - sizeof(*cll));	/* big-endian field */
-    
+
     /*
      * Submit the request and wait for it to complete.  (timeout
      * here should be much greater than above)
@@ -1008,7 +1008,7 @@ ciss_init_logical(struct ciss_softc *sc)
 	}
     }
     error = 0;
-    
+
  out:
     /*
      * Note that if the error is a timeout, we are taking a slight
@@ -1175,7 +1175,7 @@ out:
     }
     if (cr != NULL)
 	ciss_release_request(cr);
-	
+
     return(error);
 }
 
@@ -1210,7 +1210,7 @@ ciss_get_ldrive_status(struct ciss_softc *sc,  struct ciss_ldrive *ld)
 	ciss_printf(sc, "error sending BMIC LSTATUS command (%d)\n", error);
 	goto out;
     }
-    
+
     /*
      * Check response.
      */
@@ -1325,7 +1325,7 @@ static void
 ciss_accept_media_complete(struct ciss_request *cr)
 {
     int				command_status;
-    
+
     /*
      * Check response.
      */
@@ -1360,7 +1360,7 @@ ciss_free(struct ciss_softc *sc)
 
     /* cancel the Event Notify chain */
     ciss_notify_abort(sc);
-    
+
     /* free the controller data */
     if (sc->ciss_id != NULL)
 	free(sc->ciss_id, CISS_MALLOC_CLASS);
@@ -1460,7 +1460,7 @@ ciss_done(struct ciss_softc *sc)
     struct ciss_command	*cc;
     u_int32_t		tag, index;
     int			complete;
-    
+
     debug_called(3);
 
     /*
@@ -1543,7 +1543,7 @@ ciss_complete(struct ciss_softc *sc)
 	if ((cr = ciss_dequeue_complete(sc)) == NULL)
 	    break;
 	ciss_unmap_request(cr);
-	
+
 	/*
 	 * If the request has a callback, invoke it.
 	 */
@@ -1551,7 +1551,7 @@ ciss_complete(struct ciss_softc *sc)
 	    cr->cr_complete(cr);
 	    continue;
 	}
-	
+
 	/*
 	 * If someone is sleeping on this request, wake them up.
 	 */
@@ -1568,7 +1568,7 @@ ciss_complete(struct ciss_softc *sc)
 	    cr->cr_flags &= ~CISS_REQ_POLL;
 	    continue;
 	}
-	
+
 	/*
 	 * Give up and throw the request back on the free queue.  This
 	 * should never happen; resources will probably be lost.
@@ -1603,7 +1603,7 @@ ciss_report_request(struct ciss_request *cr, int *command_status, int *scsi_stat
 	cc->header.host_tag &= ~CISS_HDR_HOST_TAG_ERROR;
 	debug(2, "ignoring irrelevant under/overrun error");
     }
-    
+
     /*
      * Check the command's error bit, if clear, there's no status and
      * everything is OK.
@@ -1663,7 +1663,7 @@ static int
 ciss_poll_request(struct ciss_request *cr, int timeout)
 {
     int		error;
-    
+ 
     debug_called(2);
 
     cr->cr_flags |= CISS_REQ_POLL;
@@ -1786,7 +1786,7 @@ ciss_get_request(struct ciss_softc *sc, struct ciss_request **crp)
     cr->cr_flags = 0;
     cr->cr_complete = NULL;
     cr->cr_private = NULL;
-    
+
     ciss_preen_command(cr);
     *crp = cr;
     return(0);
@@ -1826,7 +1826,7 @@ ciss_release_request(struct ciss_request *cr)
     debug_called(2);
 
     sc = cr->cr_sc;
-    
+
     /* release the request to the free queue */
     ciss_requeue_free(cr);
 }
@@ -1880,7 +1880,7 @@ ciss_get_bmic_request(struct ciss_softc *sc, struct ciss_request **crp,
     cr->cr_length = bufsize;
     if (!dataout)
 	cr->cr_flags = CISS_REQ_DATAIN;
-    
+
     cc = CISS_FIND_COMMAND(cr);
     cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
     cc->header.address.physical.bus = 0;
@@ -2005,7 +2005,7 @@ ciss_map_request(struct ciss_request *cr)
     int			error = 0;
 
     debug_called(2);
-    
+
     sc = cr->cr_sc;
 
     /* check that mapping is necessary */
@@ -2030,7 +2030,7 @@ ciss_map_request(struct ciss_request *cr)
 	ciss_enqueue_busy(cr);
 	CISS_TL_SIMPLE_POST_CMD(cr->cr_sc, CISS_FIND_COMMANDPHYS(cr));
     }
-	
+
     return(0);
 }
 
@@ -2043,7 +2043,7 @@ ciss_request_map_helper(void *arg, bus_dma_segment_t *segs, int nseg, int error)
     int			i;
 
     debug_called(2);
-    
+
     cr = (struct ciss_request *)arg;
     sc = cr->cr_sc;
     cc = CISS_FIND_COMMAND(cr);
@@ -2078,13 +2078,13 @@ ciss_unmap_request(struct ciss_request *cr)
     struct ciss_softc	*sc;
 
     debug_called(2);
-    
+
     sc = cr->cr_sc;
 
     /* check that unmapping is necessary */
     if ((cr->cr_flags & CISS_REQ_MAPPED) == 0)
 	return;
-    
+
     bus_dmamap_sync(sc->ciss_command_dmat, sc->ciss_command_map,
 		    BUS_DMASYNC_POSTWRITE);
 
@@ -2145,7 +2145,7 @@ ciss_cam_init(struct ciss_softc *sc)
      * Initiate a rescan of the bus.
      */
     ciss_cam_rescan_all(sc);
-    
+
     return(0);
 }
 
@@ -2163,19 +2163,19 @@ ciss_cam_rescan_target(struct ciss_softc *sc, int target)
 	ciss_printf(sc, "rescan failed (can't allocate CCB)\n");
 	return;
     }
-    
+
     if (xpt_create_path(&sc->ciss_cam_path, xpt_periph, cam_sim_path(sc->ciss_cam_sim), target, 0)
 	!= CAM_REQ_CMP) {
 	ciss_printf(sc, "rescan failed (can't create path)\n");
 	return;
     }
-    
+
     xpt_setup_ccb(&ccb->ccb_h, sc->ciss_cam_path, 5/*priority (low)*/);
     ccb->ccb_h.func_code = XPT_SCAN_BUS;
     ccb->ccb_h.cbfcnp = ciss_cam_rescan_callback;
     ccb->crcn.flags = CAM_FLAG_NONE;
     xpt_action(ccb);
- 
+
     /* scan is now in progress */
 }
 
@@ -2372,7 +2372,7 @@ ciss_cam_action_io(struct cam_sim *sim, struct ccb_scsiio *csio)
     cr->cr_length = csio->dxfer_len;
     cr->cr_complete = ciss_cam_complete;
     cr->cr_private = csio;
-	
+
     cc->header.address.logical.mode = CISS_HDR_ADDRESS_MODE_LOGICAL;
     cc->header.address.logical.lun = target;
     cc->cdb.cdb_length = csio->cdb_len;
@@ -2413,7 +2413,7 @@ ciss_cam_action_io(struct cam_sim *sim, struct ccb_scsiio *csio)
 	}
 	return(error);
     }
-	
+
     return(0);
 }
 
@@ -2425,8 +2425,7 @@ ciss_cam_emulate(struct ciss_softc *sc, struct ccb_scsiio *csio)
 {
     int		target;
     u_int8_t	opcode;
-    
-    
+
     target = csio->ccb_h.target_id;
     opcode = (csio->ccb_h.flags & CAM_CDB_POINTER) ? 
 	*(u_int8_t *)csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes[0];
@@ -2460,11 +2459,9 @@ ciss_cam_emulate(struct ciss_softc *sc, struct ccb_scsiio *csio)
 	    return(1);
 	}
     }
-	    
 
     /* if we have to fake Synchronise Cache */
     if (sc->ciss_flags & CISS_FLAG_FAKE_SYNCH) {
-	
 	/*
 	 * If this is a Synchronise Cache command, typically issued when
 	 * a device is closed, flush the adapter and complete now.
@@ -2519,7 +2516,7 @@ ciss_cam_complete(struct ciss_request *cr)
      */
     ciss_report_request(cr, &command_status, &scsi_status);
     csio->scsi_status = scsi_status;
-    
+
     /*
      * Handle specific SCSI status values.
      */
@@ -2529,7 +2526,7 @@ ciss_cam_complete(struct ciss_request *cr)
 	debug(0, "adapter error");
 	csio->ccb_h.status = CAM_REQ_CMP_ERR;
 	break;
-	
+
 	/* no status due to command completed OK */
     case SCSI_STATUS_OK:		/* CISS_SCSI_STATUS_GOOD */
 	debug(2, "SCSI_STATUS_OK");
@@ -2590,7 +2587,7 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio)
 	inq = (struct scsi_inquiry_data *)csio->data_ptr;
 	target = csio->ccb_h.target_id;
 	cl = &sc->ciss_logical[target];
-	
+
 	padstr(inq->vendor, "COMPAQ", 8);
 	padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8);
 	padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16);
@@ -2645,7 +2642,7 @@ ciss_periodic(void *arg)
     struct ciss_softc	*sc;
 
     debug_called(1);
-    
+
     sc = (struct ciss_softc *)arg;
 
     /*
@@ -2664,7 +2661,7 @@ ciss_periodic(void *arg)
 	sc->ciss_heart_attack = 0;
 	debug(3, "new heartbeat 0x%x", sc->ciss_heartbeat);
     }
-    
+
     /*
      * If the notify event request has died for some reason, or has
      * not started yet, restart it.
@@ -2699,7 +2696,7 @@ ciss_notify_event(struct ciss_softc *sc)
     debug_called(1);
 
     cr = sc->ciss_periodic_notify;
-    
+
     /* get a request if we don't already have one */
     if (cr == NULL) {
 	if ((error = ciss_get_request(sc, &cr)) != 0) {
@@ -2710,7 +2707,7 @@ ciss_notify_event(struct ciss_softc *sc)
 	cr->cr_complete = ciss_notify_complete;
 	debug(1, "acquired request %d", cr->cr_tag);
     }
-    
+
     /* 
      * Get a databuffer if we don't already have one, note that the
      * adapter command wants a larger buffer than the actual
@@ -2739,7 +2736,7 @@ ciss_notify_event(struct ciss_softc *sc)
     cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
     cc->cdb.direction = CISS_CDB_DIRECTION_READ;
     cc->cdb.timeout = 0;	/* no timeout, we hope */
-    
+
     cnc = (struct ciss_notify_cdb *)&(cc->cdb.cdb[0]);
     bzero(cr->cr_data, CISS_NOTIFY_DATA_SIZE);
     cnc->opcode = CISS_OPCODE_READ;
@@ -2780,11 +2777,11 @@ ciss_notify_complete(struct ciss_request *cr)
     int			command_status;
 
     debug_called(1);
-    
+
     cc = CISS_FIND_COMMAND(cr);
     cn = (struct ciss_notify *)cr->cr_data;
     sc = cr->cr_sc;
-    
+
     /*
      * Report request results, decode status.
      */
@@ -2847,7 +2844,7 @@ ciss_notify_complete(struct ciss_request *cr)
 	sc->ciss_periodic_notify = NULL;
 	wakeup(&sc->ciss_periodic_notify);
     }
-	
+
     /*
      * Send a new notify event command, if we're not aborting.
      */
@@ -2878,11 +2875,11 @@ ciss_notify_abort(struct ciss_softc *sc)
 
     cr = NULL;
     error = 0;
-    
+
     /* verify that there's an outstanding command */
     if (!(sc->ciss_flags & CISS_FLAG_NOTIFY_OK))
 	goto out;
-    
+
     /* get a command to issue the abort with */
     if ((error = ciss_get_request(sc, &cr)))
 	goto out;
@@ -2894,7 +2891,7 @@ ciss_notify_abort(struct ciss_softc *sc)
 	goto out;
     }
     cr->cr_length = CISS_NOTIFY_DATA_SIZE;
-    
+
     /* build the CDB */
     cc = CISS_FIND_COMMAND(cr);
     cc->header.address.physical.mode = CISS_HDR_ADDRESS_MODE_PERIPHERAL;
@@ -2905,7 +2902,7 @@ ciss_notify_abort(struct ciss_softc *sc)
     cc->cdb.attribute = CISS_CDB_ATTRIBUTE_SIMPLE;
     cc->cdb.direction = CISS_CDB_DIRECTION_READ;
     cc->cdb.timeout = 0;	/* no timeout, we hope */
-    
+
     cnc = (struct ciss_notify_cdb *)&(cc->cdb.cdb[0]);
     bzero(cnc, sizeof(*cnc));
     cnc->opcode = CISS_OPCODE_WRITE;
@@ -2913,7 +2910,7 @@ ciss_notify_abort(struct ciss_softc *sc)
     cnc->length = htonl(CISS_NOTIFY_DATA_SIZE);
 
     ciss_print_request(cr);
-    
+
     /*
      * Submit the request and wait for it to complete.
      */
@@ -2938,7 +2935,7 @@ ciss_notify_abort(struct ciss_softc *sc)
 	if (error != 0)
 	    goto out;
 	break;
-	
+
     case CISS_CMD_STATUS_TARGET_STATUS:
 	/*
 	 * This can happen if the adapter thinks there wasn't an outstanding
@@ -2951,14 +2948,14 @@ ciss_notify_abort(struct ciss_softc *sc)
 	    goto out;
 	}
 	/* FALLTHROUGH */
-	    
+
     default:
 	ciss_printf(sc, "Abort Notify Event command failed (%s)\n",
 		    ciss_name_command_status(command_status));
 	error = EIO;
 	goto out;
     }
-    
+
     /*
      * Sleep waiting for the notifier command to complete.  Note
      * that if it doesn't, we may end up in a bad situation, since
@@ -3005,7 +3002,7 @@ ciss_notify_abort_bmic(struct ciss_softc *sc)
     /* verify that there's an outstanding command */
     if (!(sc->ciss_flags & CISS_FLAG_NOTIFY_OK))
 	goto out;
-    
+
     /*
      * Build a BMIC command to cancel the Notify on Event command.
      *
@@ -3022,7 +3019,7 @@ ciss_notify_abort_bmic(struct ciss_softc *sc)
 	ciss_printf(sc, "error sending BMIC Cancel Notify on Event command (%d)\n", error);
 	goto out;
     }
-    
+
     /*
      * Check response.
      */
@@ -3133,7 +3130,7 @@ ciss_notify_logical(struct ciss_softc *sc, struct ciss_notify *cn)
 static void
 ciss_notify_physical(struct ciss_softc *sc, struct ciss_notify *cn)
 {
-    
+ 
 }
 
 /************************************************************************
@@ -3148,7 +3145,7 @@ ciss_print_request(struct ciss_request *cr)
 
     sc = cr->cr_sc;
     cc = CISS_FIND_COMMAND(cr);
-    
+
     ciss_printf(sc, "REQUEST @ %p\n", cr);
     ciss_printf(sc, "  data %p/%d  tag %d  flags %b\n",
 	      cr->cr_data, cr->cr_length, cr->cr_tag, cr->cr_flags,
@@ -3285,7 +3282,6 @@ ciss_print_adapter(struct ciss_softc *sc)
 
     for (i = 1; i < sc->ciss_max_requests; i++)
 	ciss_print_request(sc->ciss_request + i);
-
 }
 
 /* DDB hook */
@@ -3434,11 +3430,11 @@ ciss_open(dev_t dev, int flags, int fmt, d_thread_t *p)
     struct ciss_softc	*sc;
 
     debug_called(1);
-    
+
     sc = (struct ciss_softc *)dev->si_drv1;
 
     /* we might want to veto if someone already has us open */
-	
+
     sc->ciss_flags |= CISS_FLAG_CONTROL_OPEN;
     return(0);
 }
@@ -3452,9 +3448,9 @@ ciss_close(dev_t dev, int flags, int fmt, d_thread_t *p)
     struct ciss_softc	*sc;
 
     debug_called(1);
-    
+
     sc = (struct ciss_softc *)dev->si_drv1;
-    
+
     sc->ciss_flags &= ~CISS_FLAG_CONTROL_OPEN;
     return (0);
 }
@@ -3487,7 +3483,7 @@ ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *p)
 
 	break;
     }
-    
+
     case CCISS_GETINTINFO:
     {
 	cciss_coalint_struct	*cis = (cciss_coalint_struct *)addr;
@@ -3532,7 +3528,7 @@ ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *p)
 	if (ciss_update_config(sc))
 	    error = EIO;
 	break;
-	
+
     case CCISS_GETHEARTBEAT:
 	*(Heartbeat_type *)addr = sc->ciss_cfg->heartbeat;
 	break;