Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 23 Jun 2012 07:49:11 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r237472 - stable/8/sys/cam/scsi
Message-ID:  <201206230749.q5N7nB23027886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Sat Jun 23 07:49:10 2012
New Revision: 237472
URL: http://svn.freebsd.org/changeset/base/237472

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

Modified:
  stable/8/sys/cam/scsi/scsi_cd.c
  stable/8/sys/cam/scsi/scsi_da.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_cd.c	Sat Jun 23 07:48:00 2012	(r237471)
+++ stable/8/sys/cam/scsi/scsi_cd.c	Sat Jun 23 07:49:10 2012	(r237472)
@@ -1036,7 +1036,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)
@@ -1045,7 +1044,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: stable/8/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_da.c	Sat Jun 23 07:48:00 2012	(r237471)
+++ stable/8/sys/cam/scsi/scsi_da.c	Sat Jun 23 07:49:10 2012	(r237472)
@@ -956,14 +956,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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206230749.q5N7nB23027886>