svn commit: r220778 - head/sys/cam/ata

[Alexander Motin]

Author: mav
Date: Mon Apr 18 13:59:56 2011
New Revision: 220778
URL: http://svn.freebsd.org/changeset/base/220778

Log:
  Remove some used variables.
  
  Found with:	Clang Static Analyzer

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/ata/ata_pmp.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Mon Apr 18 13:34:31 2011	(r220777)
+++ head/sys/cam/ata/ata_da.c	Mon Apr 18 13:59:56 2011	(r220778)
@@ -274,7 +274,6 @@ adaopen(struct disk *dp)
 {
 	struct cam_periph *periph;
 	struct ada_softc *softc;
-	int unit;
 	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
@@ -293,13 +292,12 @@ adaopen(struct disk *dp)
 		return (error);
 	}
 
-	unit = periph->unit_number;
 	softc = (struct ada_softc *)periph->softc;
 	softc->flags |= ADA_FLAG_OPEN;
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE,
 	    ("adaopen: disk=%s%d (unit %d)\n", dp->d_name, dp->d_unit,
-	     unit));
+	     periph->unit_number));
 
 	if ((softc->flags & ADA_FLAG_PACK_INVALID) != 0) {
 		/* Invalidate our pack information. */
@@ -1314,11 +1312,6 @@ adadone(struct cam_periph *periph, union
 static int
 adaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags)
 {
-	struct ada_softc	  *softc;
-	struct cam_periph *periph;
-
-	periph = xpt_path_periph(ccb->ccb_h.path);
-	softc = (struct ada_softc *)periph->softc;
 
 	return(cam_periph_error(ccb, cam_flags, sense_flags, NULL));
 }

Modified: head/sys/cam/ata/ata_pmp.c
==============================================================================
--- head/sys/cam/ata/ata_pmp.c	Mon Apr 18 13:34:31 2011	(r220777)
+++ head/sys/cam/ata/ata_pmp.c	Mon Apr 18 13:59:56 2011	(r220778)
@@ -215,12 +215,9 @@ pmprelease(struct cam_periph *periph, in
 static void
 pmponinvalidate(struct cam_periph *periph)
 {
-	struct pmp_softc *softc;
 	struct cam_path *dpath;
 	int i;
 
-	softc = (struct pmp_softc *)periph->softc;
-
 	/*
 	 * De-register any async callbacks.
 	 */
@@ -548,7 +545,7 @@ pmpdone(struct cam_periph *periph, union
 	struct ccb_trans_settings cts;
 	struct pmp_softc *softc;
 	struct ccb_ataio *ataio;
-	struct cam_path *path, *dpath;
+	struct cam_path *dpath;
 	u_int32_t  priority, res;
 	int i;
 
@@ -557,7 +554,6 @@ pmpdone(struct cam_periph *periph, union
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("pmpdone\n"));
 
-	path = done_ccb->ccb_h.path;
 	priority = done_ccb->ccb_h.pinfo.priority;
 
 	if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
@@ -583,10 +579,10 @@ pmpdone(struct cam_periph *periph, union
 
 	switch (softc->state) {
 	case PMP_STATE_PORTS:
-		softc->pm_ports = (done_ccb->ataio.res.lba_high << 24) +
-		    (done_ccb->ataio.res.lba_mid << 16) +
-		    (done_ccb->ataio.res.lba_low << 8) +
-		    done_ccb->ataio.res.sector_count;
+		softc->pm_ports = (ataio->res.lba_high << 24) +
+		    (ataio->res.lba_mid << 16) +
+		    (ataio->res.lba_low << 8) +
+		    ataio->res.sector_count;
 		/* This PMP declares 6 ports, while only 5 of them are real.
 		 * Port 5 is enclosure management bridge port, which has implementation
 		 * problems, causing probe faults. Hide it for now. */
@@ -650,10 +646,10 @@ pmpdone(struct cam_periph *periph, union
 		xpt_schedule(periph, priority);
 		return;
 	case PMP_STATE_CHECK:
-		res = (done_ccb->ataio.res.lba_high << 24) +
-		    (done_ccb->ataio.res.lba_mid << 16) +
-		    (done_ccb->ataio.res.lba_low << 8) +
-		    done_ccb->ataio.res.sector_count;
+		res = (ataio->res.lba_high << 24) +
+		    (ataio->res.lba_mid << 16) +
+		    (ataio->res.lba_low << 8) +
+		    ataio->res.sector_count;
 		if (((res & 0xf0f) == 0x103 && (res & 0x0f0) != 0) ||
 		    (res & 0x600) != 0) {
 			if (bootverbose) {