Zap trailing whitespace.

1 files changed, 21 insertions, 21 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index af6787de82a..4ae7920d7ff 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.106 2006/03/15 20:20:42 miod Exp $	*/
+/*	$OpenBSD: cd.c,v 1.107 2006/05/11 00:45:59 krw Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -284,7 +284,7 @@ cddetach(self, flags)
 /*
  * Open the device. Make sure the partition info is as up-to-date as can be.
  */
-int 
+int
 cdopen(dev, flag, fmt, p)
 	dev_t dev;
 	int flag, fmt;
@@ -333,7 +333,7 @@ cdopen(dev, flag, fmt, p)
 		error = scsi_test_unit_ready(sc_link, TEST_READY_RETRIES_CD,
 		    (rawopen ? SCSI_SILENT : 0) | SCSI_IGNORE_ILLEGAL_REQUEST |
 		    SCSI_IGNORE_MEDIA_CHANGE);
-			
+
 		/* Start the cd spinning if necessary. */
 		if (error == EIO)
 			error = scsi_start(sc_link, SSS_START,
@@ -389,7 +389,7 @@ out:	/* Insure only one open at a time. */
 	sc_link->flags |= SDEV_OPEN;
 	SC_DEBUG(sc_link, SDEV_DB3, ("open complete\n"));
 
-	/* It's OK to fall through because dk_openmask is now non-zero. */	
+	/* It's OK to fall through because dk_openmask is now non-zero. */
 bad:
 	if (cd->sc_dk.dk_openmask == 0) {
 		scsi_prevent(sc_link, PR_ALLOW,
@@ -406,7 +406,7 @@ bad:
  * Close the device. Only called if we are the last occurrence of an open
  * device.
  */
-int 
+int
 cdclose(dev, flag, fmt, p)
 	dev_t dev;
 	int flag, fmt;
@@ -517,7 +517,7 @@ cdstrategy(bp)
 	 * not doing anything, otherwise just wait for completion
 	 */
 	cdstart(cd);
-	
+
 	device_unref(&cd->sc_dev);
 	splx(s);
 	return;
@@ -552,7 +552,7 @@ done:
  * must be called at the correct (highish) spl level
  * cdstart() is called at splbio from cdstrategy and scsi_done
  */
-void 
+void
 cdstart(v)
 	void *v;
 {
@@ -740,7 +740,7 @@ void
 lba2msf (lba, m, s, f)
 	u_long lba;
 	u_char *m, *s, *f;
-{   
+{
 	u_long tmp;
 
 	tmp = lba + CD_BLOCK_OFFSET;	/* offset of first logical frame */
@@ -811,7 +811,7 @@ cdioctl(dev, cmd, addr, flag, p)
 		case CDIOCCLRDEBUG:
 		case CDIOCRESET:
 		case DVD_AUTH:
-		case DVD_READ_STRUCT:	
+		case DVD_READ_STRUCT:
 		case MTIOCTOP:
 			if (part == RAW_PART)
 				break;
@@ -862,7 +862,7 @@ cdioctl(dev, cmd, addr, flag, p)
 		cd->flags &= ~CDF_LABELLING;
 		cdunlock(cd);
 		break;
-		
+
 	case DIOCWLABEL:
 		error = EBADF;
 		break;
@@ -918,7 +918,7 @@ cdioctl(dev, cmd, addr, flag, p)
 
 		if ((error = cd_read_toc(cd, 0, 0, &th, sizeof(th), 0)) != 0)
 			break;
-		if (cd->sc_link->quirks & ADEV_LITTLETOC) 
+		if (cd->sc_link->quirks & ADEV_LITTLETOC)
 			th.len = letoh16(th.len);
 		else
 			th.len = betoh16(th.len);
@@ -1080,7 +1080,7 @@ cdioctl(dev, cmd, addr, flag, p)
 
 	close_tray:
 	case CDIOCCLOSE:
-		error = scsi_start(cd->sc_link, SSS_START|SSS_LOEJ, 
+		error = scsi_start(cd->sc_link, SSS_START|SSS_LOEJ,
 		    SCSI_IGNORE_NOT_READY | SCSI_IGNORE_MEDIA_CHANGE);
 		break;
 
@@ -1238,7 +1238,7 @@ cd_size(cd, flags)
 	struct scsi_read_cd_capacity scsi_cmd;
 	int blksize;
 	u_long size;
-	
+
 	/* Reasonable defaults for drives that don't support
 	   READ_CD_CAPACITY */
 	cd->params.blksize = 2048;
@@ -1308,7 +1308,7 @@ cd_setchan(cd, p0, p1, p2, p3, flags)
 		else
 			error = scsi_mode_select(cd->sc_link, SMS_PF,
 			    &data->hdr, flags, 20000);
-	}	
+	}
 
 	free(data, M_TEMP);
 	return (error);
@@ -1338,7 +1338,7 @@ cd_getvol(cd, arg, flags)
 		arg->vol[1] = audio->port[1].volume;
 		arg->vol[2] = audio->port[2].volume;
 		arg->vol[3] = audio->port[3].volume;
-	}		
+	}
 
 	free(data, M_TEMP);
 	return (0);
@@ -1367,7 +1367,7 @@ cd_setvol(cd, arg, flags)
 	if (error != 0) {
 		free(data, M_TEMP);
 		return (error);
-	}	
+	}
 
 	mask_volume[0] = audio->port[0].volume;
 	mask_volume[1] = audio->port[1].volume;
@@ -1381,7 +1381,7 @@ cd_setvol(cd, arg, flags)
 	if (error != 0) {
 		free(data, M_TEMP);
 		return (error);
-	}	
+	}
 
 	audio->port[0].volume = arg->vol[0] & mask_volume[0];
 	audio->port[1].volume = arg->vol[1] & mask_volume[1];
@@ -1410,7 +1410,7 @@ cd_load_unload(cd, options, slot)
 	cmd.opcode = LOAD_UNLOAD;
 	cmd.options = options;    /* ioctl uses ATAPI values */
 	cmd.slot = slot;
-	
+
 	return (scsi_scsi_cmd(cd->sc_link, (struct scsi_generic *)&cmd,
 	    sizeof(cmd), 0, 0, CDRETRIES, 200000, NULL, 0));
 }
@@ -1892,7 +1892,7 @@ dvd_read_disckey(cd, s)
 	struct scsi_read_dvd_structure cmd;
 	struct scsi_read_dvd_structure_data *buf;
 	int error;
-	
+
 	buf = malloc(sizeof(*buf), M_TEMP, M_WAITOK);
 	if (buf == NULL)
 		return (ENOMEM);
@@ -1948,7 +1948,7 @@ dvd_read_manufact(cd, s)
 	struct scsi_read_dvd_structure cmd;
 	struct scsi_read_dvd_structure_data *buf;
 	int error;
-	
+
 	buf = malloc(sizeof(*buf), M_TEMP, M_WAITOK);
 	if (buf == NULL)
 		return (ENOMEM);
@@ -1968,7 +1968,7 @@ dvd_read_manufact(cd, s)
 			bcopy(buf->data, s->manufact.value, s->manufact.len);
 		else
 			error = EIO;
-	}	
+	}
 
 	free(buf, M_TEMP);
 	return (error);