svn commit: r237336 - head/sys/cam/scsi

Alexander Motin mav at FreeBSD.org
Wed Jun 20 18:35:36 UTC 2012


Author: mav
Date: Wed Jun 20 18:35:36 2012
New Revision: 237336
URL: http://svn.freebsd.org/changeset/base/237336

Log:
  Remove unused error variables in cdclose() and daclose().

Modified:
  head/sys/cam/scsi/scsi_cd.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Wed Jun 20 18:25:51 2012	(r237335)
+++ head/sys/cam/scsi/scsi_cd.c	Wed Jun 20 18:35:36 2012	(r237336)
@@ -1041,7 +1041,6 @@ cdclose(struct disk *dp)
 {
 	struct 	cam_periph *periph;
 	struct	cd_softc *softc;
-	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
 	if (periph == NULL)
@@ -1050,7 +1049,7 @@ cdclose(struct disk *dp)
 	softc = (struct cd_softc *)periph->softc;
 
 	cam_periph_lock(periph);
-	if ((error = cam_periph_hold(periph, PRIBIO)) != 0) {
+	if (cam_periph_hold(periph, PRIBIO) != 0) {
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return (0);

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Wed Jun 20 18:25:51 2012	(r237335)
+++ head/sys/cam/scsi/scsi_da.c	Wed Jun 20 18:35:36 2012	(r237336)
@@ -982,14 +982,13 @@ daclose(struct disk *dp)
 {
 	struct	cam_periph *periph;
 	struct	da_softc *softc;
-	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
 	if (periph == NULL)
 		return (0);	
 
 	cam_periph_lock(periph);
-	if ((error = cam_periph_hold(periph, PRIBIO)) != 0) {
+	if (cam_periph_hold(periph, PRIBIO) != 0) {
 		cam_periph_unlock(periph);
 		cam_periph_release(periph);
 		return (0);


More information about the svn-src-all mailing list