From nobody Thu Jan 06 19:04:37 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E9F081943BE2; Thu, 6 Jan 2022 19:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVG4P394Rz4kf6; Thu, 6 Jan 2022 19:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 416702532C; Thu, 6 Jan 2022 19:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 206J4bap054154; Thu, 6 Jan 2022 19:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206J4bht054153; Thu, 6 Jan 2022 19:04:37 GMT (envelope-from git) Date: Thu, 6 Jan 2022 19:04:37 GMT Message-Id: <202201061904.206J4bht054153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 0565198d8092 - stable/13 - Fix "set but not used" warnings in the mps driver. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0565198d8092f07718c8da6103af4d6cedd41378 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641495877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUX27CIuwjXmqUkqAnZl9J66CNKggZB2F+gDW82ZF8g=; b=i/2ScPooKu5/wEsXipsY6oXby6oXbI4s+QWcajvnQkgSZfLLdT2gTmvkXF5imQsfFlU/kM R7X24qzCVOcUAYQ1Bdbkku4ZWbhFBgnxD9CkGH6+CKIgHyAGe4n4WrJJlTzJRW4NTE+wgC MhWUTubUjP+QjfUM1Nuf4CFJRK1BBxLpPcTaszmXTTb0H5dFTwb6BUYBXB/OGZUOaELXC0 i+syhin7/prhPEdfirLrcU4jQGMC/CUJOBkGAtAdIPyCcUYZyFplFKhh4+uZkMbfH2Fxry OBa9H+NoKZqj+ZKU3S0J91gp8Og448Uv8hvKXkpAHKMbvlDFMtDrdHQIbSFbMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641495877; a=rsa-sha256; cv=none; b=GH7fvdPewH1VAyDYTUj063JGxCYXZsEc7rr54Colx/KetFUwX56LGEvjJmQ4quI32jsaEv 2SNb3+oh6mSKly1s3VhmcGSfI2H4d9zrhpk+0i2rMLFIgMEL4viP0t6psG8zMw2JC8uqeq cgZPej7V9Cd3FGP1Bxu5h0F5Ui0NhgdzQA4FT4KPUXbOUQ2wjqJCqgZ0zvR+U7nwCEhiFM TflmkfWxioS/oxzorU4LfYBCeUuFPlhKrfOw++k2Z3VBhfS7nG3ygZX32V6km41sqwJ18i 5bsIsNZaEj/Wy3HasKk0D4/NySpbVAavt7BkQ7PR+reCmGogzJihG8CtUV/eZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=0565198d8092f07718c8da6103af4d6cedd41378 commit 0565198d8092f07718c8da6103af4d6cedd41378 Author: Scott Long AuthorDate: 2021-11-25 03:23:02 +0000 Commit: Alexander Motin CommitDate: 2022-01-06 19:01:59 +0000 Fix "set but not used" warnings in the mps driver. (cherry picked from commit bcce9c5bedfafd6f0f76c022c8a1e45fa8e9fd0a) --- sys/dev/mps/mps_sas.c | 2 -- sys/dev/mps/mps_sas_lsi.c | 3 --- sys/dev/mps/mps_table.c | 2 -- 3 files changed, 7 deletions(-) diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 971ad8f4a123..2d580edca9eb 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -1180,14 +1180,12 @@ static void mpssas_logical_unit_reset_complete(struct mps_softc *sc, struct mps_command *tm) { MPI2_SCSI_TASK_MANAGE_REPLY *reply; - MPI2_SCSI_TASK_MANAGE_REQUEST *req; unsigned int cm_count = 0; struct mps_command *cm; struct mpssas_target *targ; callout_stop(&tm->cm_callout); - req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)tm->cm_req; reply = (MPI2_SCSI_TASK_MANAGE_REPLY *)tm->cm_reply; targ = tm->cm_targ; diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c index 8cfb1700c705..dc22af1e47d0 100644 --- a/sys/dev/mps/mps_sas_lsi.c +++ b/sys/dev/mps/mps_sas_lsi.c @@ -268,9 +268,6 @@ mpssas_fw_work(struct mps_softc *sc, struct mps_fw_event_work *fw_event) } case MPI2_EVENT_SAS_ENCL_DEVICE_STATUS_CHANGE: { - Mpi2EventDataSasEnclDevStatusChange_t *data; - data = (Mpi2EventDataSasEnclDevStatusChange_t *) - fw_event->event_data; mps_mapping_enclosure_dev_status_change_event(sc, fw_event->event_data); break; diff --git a/sys/dev/mps/mps_table.c b/sys/dev/mps/mps_table.c index e3254570b496..aec97327e6b6 100644 --- a/sys/dev/mps/mps_table.c +++ b/sys/dev/mps/mps_table.c @@ -519,12 +519,10 @@ mps_print_sgl(struct mps_softc *sc, struct mps_command *cm, int offset) { MPI2_SGE_SIMPLE64 *sge; MPI2_SGE_CHAIN32 *sgc; - MPI2_REQUEST_HEADER *req; struct mps_chain *chain = NULL; char *frame; u_int i = 0, flags; - req = (MPI2_REQUEST_HEADER *)cm->cm_req; frame = (char *)cm->cm_req; sge = (MPI2_SGE_SIMPLE64 *)&frame[offset * 4]; printf("SGL for command %p\n", cm);