From c12a93745fcb4d0b29533f419b5a9903fc4b9401 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 1 Jun 2003 09:12:24 +0000
Subject: [PATCH] Remove unused variables. Remove break after return. Add XXX
 comment where intent is unclear.

Found by:       FlexeLint
---
 sys/cam/scsi/scsi_sa.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index a7e40b6f2264..e8027e13910e 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -443,14 +443,10 @@ saopen(dev_t dev, int flags, int fmt, struct thread *td)
 	struct cam_periph *periph;
 	struct sa_softc *softc;
 	int unit;
-	int mode;
-	int density;
 	int error;
 	int s;
 
 	unit = SAUNIT(dev);
-	mode = SAMODE(dev);
-	density = SADENSITY(dev);
 
 	s = splsoftcam();
 	periph = (struct cam_periph *)dev->si_drv1;
@@ -764,14 +760,10 @@ saioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct thread *td)
 	scsi_space_code spaceop;
 	int didlockperiph = 0;
 	int s;
-	int unit;
 	int mode;
-	int density;
 	int error = 0;
 
-	unit = SAUNIT(dev);
 	mode = SAMODE(dev);
-	density = SADENSITY(dev);
 	error = 0;		/* shut up gcc */
 	spaceop = 0;		/* shut up gcc */
 
@@ -2264,9 +2256,7 @@ sacheckeod(struct cam_periph *periph)
 {
 	int	error;
 	int	markswanted;
-	struct	sa_softc *softc;
 
-	softc = (struct sa_softc *)periph->softc;
 	markswanted = samarkswanted(periph);
 
 	if (markswanted > 0) {
@@ -2379,7 +2369,6 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs)
 	case CAM_BDR_SENT:
 		if (ccb->ccb_h.retry_count <= 0) {
 			return (EIO);
-			break;
 		}
 		/* FALLTHROUGH */
 	default:
@@ -2826,6 +2815,7 @@ sasetparams(struct cam_periph *periph, sa_params params_to_set,
 			}
 			break;
 		}
+		/* XXX: fall-through intentional ? */
 		case SA_DEVICE_CONFIGURATION_PAGE:
 		{
 			struct scsi_dev_conf_page *dcp = &cpage->dconf;