From nobody Sat Feb 26 18:08:01 2022 X-Original-To: dev-commits-src-main@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 B6A2819E4E29; Sat, 26 Feb 2022 18:08:01 +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 4K5ZPY4pMPz4R4q; Sat, 26 Feb 2022 18:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645898881; 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=KDmh/UVlgVW+vyvLsePeP25TTDbUtHOZzC5St2QK+HY=; b=baDoKaCZgsaJCl1LtG3FNnLXv6owO0NeTC08ezJTkcPf9ROByXufXduw5HgPRiVaU/utuQ YuH48qzfhU8yK5gynO6S4TT9sGYddfw2gDCXiHjO36amPdawd2UHgrDjPNEE29LR9XR4So LO4Jhsqxh/i1Ccih+Oa/+J4Wp6HzmsRb32/PGyrRXxkqx52uWQ0bUsH7O9uwbSkxyV99Fj bLzQJgfTO7HadFdsV8NuA9TvkGWkD8Q+S/f83o6AdzM++nQH/dl74zWH87noH1ODBGzosR CKUEJvtLlMEN4F18zOVnhb1yuQS0kZvN1852OExAIipCh6y3fRsgl5dgEJoiQA== 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 80FA418335; Sat, 26 Feb 2022 18:08:01 +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 21QI81lK013962; Sat, 26 Feb 2022 18:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21QI81C0013961; Sat, 26 Feb 2022 18:08:01 GMT (envelope-from git) Date: Sat, 26 Feb 2022 18:08:01 GMT Message-Id: <202202261808.21QI81C0013961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Scott Long Subject: git: fa911920b1f0 - main - Fix "set but not used" for real in the ciss driver. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: scottl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa911920b1f0a2ac082446ac221d1c63fd989db9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645898881; 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=KDmh/UVlgVW+vyvLsePeP25TTDbUtHOZzC5St2QK+HY=; b=F9A+9fLBpaMMGh9/i689K5ZIxC/7E1NcCLWD00xsBct+HJRETZtGY6pZ12pIhXVh9/Mzm3 6b8jjWgstao6PqsWWCvzrjbY+IU3j3hC1SLEDuYW9nDIjYNiXa+N61uAZdsbgX/xH9gB/v CwwYPceDUuKYJxnB1v31RtILawPAxs+Dbx42zlXLOTqAl1kEyC220WqUmfXKIri8bHU9AA ODT9jxOdQPpmXU9+op9Klnp8N8HFdXAb80x3FAeJi1uI26f1OR8P07KJRxTkzV1ExNcNRe f1EicnNf5vbMedeN/2TeRIrvmXoQCDrvrNGO25hmZB35RdAGizCXQEP1oQEo4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645898881; a=rsa-sha256; cv=none; b=omE6Bx22X88slKzcCfEzr77KRmPF1ULi8MHDl6LK4KvDWqdmP3QslR3++cux5VScYAfHqy z06iCruInrC4eEha/avOw2IO9QZRMlKOITLpAn8aLQHx/fnUh5dQXXPUxLq7jo+NKUNXLA UU4MTohRDbzAoMskDzNAudLkqalXUbcwdIkvhCd8eWw3XY55JWZ3L9q562y3wMwGaAi33t CfYWZFACW4bro2j0k6JkmSItTp/S/cGj8DwgME3UL1oS7SpscmXS2j/x+R1gNo3Dn4yZHz 1vQ1XqMPzlwLlb5y20LqGIY7II1CaMbuG+oR936uDzfahs2ei/U29zK3+gn2wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by scottl: URL: https://cgit.FreeBSD.org/src/commit/?id=fa911920b1f0a2ac082446ac221d1c63fd989db9 commit fa911920b1f0a2ac082446ac221d1c63fd989db9 Author: Scott Long AuthorDate: 2022-02-26 18:07:05 +0000 Commit: Scott Long CommitDate: 2022-02-26 18:07:05 +0000 Fix "set but not used" for real in the ciss driver. --- sys/dev/ciss/ciss.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 100562cfc737..0b9648ed530d 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -2076,11 +2076,9 @@ ciss_free(struct ciss_softc *sc) static int ciss_start(struct ciss_request *cr) { - struct ciss_command *cc __diagused; int error; - cc = cr->cr_cc; - debug(2, "post command %d tag %d ", cr->cr_tag, cc->header.host_tag); + debug(2, "post command %d tag %d ", cr->cr_tag, cr->cr_cc->header.host_tag); /* * Map the request's data. @@ -3061,14 +3059,11 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb) case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts = &ccb->cts; - int bus __diagused, target __diagused; struct ccb_trans_settings_spi *spi = &cts->xport_specific.spi; struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi; - bus = cam_sim_bus(sim); - target = cts->ccb_h.target_id; - - debug(1, "XPT_GET_TRAN_SETTINGS %d:%d", bus, target); + debug(1, "XPT_GET_TRAN_SETTINGS %d:%d", cam_sim_bus(sim), + ctl->ccb_h.target_id); /* disconnect always OK */ cts->protocol = PROTO_SCSI; cts->protocol_version = SCSI_REV_2;