svn commit: r295113 - head/sys/dev/mps

[Marcelo Araujo]

Author: araujo
Date: Mon Feb  1 02:31:59 2016
New Revision: 295113
URL: https://svnweb.freebsd.org/changeset/base/295113

Log:
  Clean up unused-but-set-variable spotted by gcc-4.9.
  
  Reviewed by:	mav, slm
  Approved by:	rodrigc (mentor)
  MFC after:	2 weeks
  Sponsored by:	gandi.net

Modified:
  head/sys/dev/mps/mps_mapping.c
  head/sys/dev/mps/mps_sas.c

Modified: head/sys/dev/mps/mps_mapping.c
==============================================================================
--- head/sys/dev/mps/mps_mapping.c	Mon Feb  1 02:04:40 2016	(r295112)
+++ head/sys/dev/mps/mps_mapping.c	Mon Feb  1 02:31:59 2016	(r295113)
@@ -890,7 +890,7 @@ _mapping_get_dev_info(struct mps_softc *
 	u16 ioc_pg8_flags = le16toh(sc->ioc_pg8.Flags);
 	Mpi2ConfigReply_t mpi_reply;
 	Mpi2SasDevicePage0_t sas_device_pg0;
-	u8 entry, enc_idx, phy_idx, sata_end_device;
+	u8 entry, enc_idx, phy_idx;
 	u32 map_idx, index, device_info;
 	struct _map_phy_change *phy_change, *tmp_phy_change;
 	uint64_t sas_address;
@@ -920,10 +920,8 @@ _mapping_get_dev_info(struct mps_softc *
 		sas_address = sas_device_pg0.SASAddress.High;
 		sas_address = (sas_address << 32) |
 		    sas_device_pg0.SASAddress.Low;
-		sata_end_device = 0;
 		if ((device_info & MPI2_SAS_DEVICE_INFO_END_DEVICE) &&
 		    (device_info & MPI2_SAS_DEVICE_INFO_SATA_DEVICE)) {
-			sata_end_device = 1;
 			rc = mpssas_get_sas_address_for_sata_disk(sc,
 			    &sas_address, phy_change->dev_handle, device_info,
 			    &phy_change->is_SATA_SSD);

Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c	Mon Feb  1 02:04:40 2016	(r295112)
+++ head/sys/dev/mps/mps_sas.c	Mon Feb  1 02:31:59 2016	(r295113)
@@ -2797,11 +2797,9 @@ mpssas_send_smpcmd(struct mpssas_softc *
 	uint8_t *request, *response;
 	MPI2_SMP_PASSTHROUGH_REQUEST *req;
 	struct mps_softc *sc;
-	struct sglist *sg;
 	int error;
 
 	sc = sassc->sc;
-	sg = NULL;
 	error = 0;
 
 	/*