From nobody Sat Feb 26 17:34:12 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 1702919DCC22; Sat, 26 Feb 2022 17:34:13 +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 4K5YfX6z8Nz3pfg; Sat, 26 Feb 2022 17:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645896853; 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=K2TRmD0Y7SVaGrZHaV8+B2vCJcKhc2vciVSdlmAuf/8=; b=fWqBfUAXce3YEcK5doOF7+fLDPV2ZSZbPHuXDiIYizOkkKYWYYsqU8NNMM+1FVoxUq3L+s d48i/L3cN41qXXhN/WNhOq9LTaIGWVMZhIDm8yH6Yc6oss8e2MFgrGeAn7n9uOr83N5nM6 OUM+ukuxFvrz6NdV03Neaiu1ArQ09P1AK0KWMDygL3j1IWP+a4GTNKCGa+hkCLGmWSDO0P 13DVb6TWKYBqv7zbh0j+i0lQJgFHXRCmqvPq0hd6CEDdtp8N40HkJQq02DjsTyPCAAKrWn sgY15lU6GtKu5D6mY6pJnN9j0Xid/dcZpvbvNCgfiGS1sSkJdxKR4uqEKvwvwQ== 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 C475B17C6D; Sat, 26 Feb 2022 17:34:12 +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 21QHYCfr072761; Sat, 26 Feb 2022 17:34:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21QHYC5d072760; Sat, 26 Feb 2022 17:34:12 GMT (envelope-from git) Date: Sat, 26 Feb 2022 17:34:12 GMT Message-Id: <202202261734.21QHYC5d072760@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: f94066c8aa35 - main - Fix "set but not used" in aic7xxx/aic79xx. The variables were dead code. 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: f94066c8aa35a27b00a9a6a132fcdcad9959177b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645896853; 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=K2TRmD0Y7SVaGrZHaV8+B2vCJcKhc2vciVSdlmAuf/8=; b=QUmDdh7vYVDGQS2PK1MMWyVpFOWs1hglu/zQUy2WegNoWmZiCsdje+boYXfvZ/QaSNcX83 WZoc9gm4JpZhB4+XnQOw0gJ0JbKRVXuAp4l4RieZoGvccfzvbgkzGWhbRQZfsxIbir0iic MUfEfCe2WR8Y2u4g+CJ+zLjW6J2wpXRXsBKgP/wykgaaqgyuotrIKiLi4U1FrpO0W5QzSZ R5tXyFl8udkNBBN/2HGFi0W8UmuyjQelI7Y/KxHYoSvpNTjnCCbVXfBKCrNS83TefJgFcv 9qEkYrfeFGNJUdDE2p4QbXuxaQKHhcV68TQSMcGyQM2IjVN5WxwB0i4F2/5aPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645896853; a=rsa-sha256; cv=none; b=Jm6Ssqso2f/9w23I/rrC5ZgmD3nRqReSlsY5i8dRMdHYxzT7FaQoIMNDyuuRLDXWSGzCCW Cd8siI6kXZMlCpLdYd/OmJZCn3sZit5vAtcuUveK8/xwDBfM8l2DlRuoRJsbzz/zMvN6nT FXcw/UdLE44+QGOmn5Po6bb5ZK9k5UG9UADV9RRtyrOmwnRPUPMjQooqhddZRTjRkaHi/k diQXY86zRU4CiWDgKapltZm8trCHVkwDWhTZDi4MMz2aT5Bkl2Hwxb1biMBlcVmfv2WasS xAqW6NoFbpSnftGOsahjU0FYZ+1Dem5WV6r2wHIZgwoob26MKNxsprvbT7s6kQ== 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=f94066c8aa35a27b00a9a6a132fcdcad9959177b commit f94066c8aa35a27b00a9a6a132fcdcad9959177b Author: Scott Long AuthorDate: 2022-02-26 17:33:31 +0000 Commit: Scott Long CommitDate: 2022-02-26 17:33:31 +0000 Fix "set but not used" in aic7xxx/aic79xx. The variables were dead code. --- sys/dev/aic7xxx/aic79xx.c | 9 --------- sys/dev/aic7xxx/aic7xxx.c | 6 ------ 2 files changed, 15 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index db4f39d39e5e..c48b5301f12a 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -4887,7 +4887,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) */ } else { uint32_t data_cnt; - uint64_t data_addr; uint32_t sglen; /* Pull in the rest of the sgptr */ @@ -4901,9 +4900,7 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) */ data_cnt &= ~AHD_SG_LEN_MASK; } - data_addr = ahd_inq(ahd, SHADDR); data_cnt += 1; - data_addr -= 1; sgptr &= SG_PTR_MASK; if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0) { struct ahd_dma64_seg *sg; @@ -4925,9 +4922,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) * bits while setting the count to 1. */ data_cnt = 1|(sglen&(~AHD_SG_LEN_MASK)); - data_addr = aic_le64toh(sg->addr) - + (sglen & AHD_SG_LEN_MASK) - - 1; /* * Increment sg so it points to the @@ -4957,9 +4951,6 @@ ahd_handle_ign_wide_residue(struct ahd_softc *ahd, struct ahd_devinfo *devinfo) * bits while setting the count to 1. */ data_cnt = 1|(sglen&(~AHD_SG_LEN_MASK)); - data_addr = aic_le32toh(sg->addr) - + (sglen & AHD_SG_LEN_MASK) - - 1; /* * Increment sg so it points to the diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 247507d80f7f..d76d17b4eac2 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -3674,7 +3674,6 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo) } else { struct ahc_dma_seg *sg; uint32_t data_cnt; - uint32_t data_addr; uint32_t sglen; /* Pull in all of the sgptr */ @@ -3690,10 +3689,7 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo) data_cnt &= ~AHC_SG_LEN_MASK; } - data_addr = ahc_inl(ahc, SHADDR); - data_cnt += 1; - data_addr -= 1; sgptr &= SG_PTR_MASK; sg = ahc_sg_bus_to_virt(scb, sgptr); @@ -3713,8 +3709,6 @@ ahc_handle_ign_wide_residue(struct ahc_softc *ahc, struct ahc_devinfo *devinfo) * while setting the count to 1. */ data_cnt = 1 | (sglen & (~AHC_SG_LEN_MASK)); - data_addr = aic_le32toh(sg->addr) - + (sglen & AHC_SG_LEN_MASK) - 1; /* * Increment sg so it points to the