svn commit: r237472 - stable/8/sys/cam/scsi
Alexander Motin
mav at FreeBSD.org
Sat Jun 23 07:49:11 UTC 2012
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);
More information about the svn-src-all
mailing list