From nobody Fri Dec 03 22:27:35 2021 X-Original-To: dev-commits-src-all@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 AB2D918C6FBE; Fri, 3 Dec 2021 22:27:36 +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 4J5SBJ1Jt1z3nFx; Fri, 3 Dec 2021 22:27:36 +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 0DAEF18E54; Fri, 3 Dec 2021 22:27:36 +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 1B3MRZBr085527; Fri, 3 Dec 2021 22:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3MRZad085526; Fri, 3 Dec 2021 22:27:35 GMT (envelope-from git) Date: Fri, 3 Dec 2021 22:27:35 GMT Message-Id: <202112032227.1B3MRZad085526@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: bca8e8c00c4e - main - Fix "set but not used" in arcmsr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bca8e8c00c4ed9d5a52943f3b58d6f2238f4dd74 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638570456; 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=JNf/M8QTL9hfDb4j1m9OnRdbdemDXYhllSoaSLdkJCI=; b=lQdWjy2iLGmFUpnbu8NnpzfKVBus0CkC/bhibbGJYSfSHvhn7kRyw/Wg65V8ceIzs/1096 rt0Ir3xdeLiodX/s0W6s3RnfMyjqbxh0tpzVrzqZmRV44zQKVr52xcu1wziwwvebKJvDgl LAexL2MiyVF6ha5Fs7wka978VpTMSboDYjBU8yWCX4VNXdFUo0F3RICv8SXEPoa7gLsrsQ BBuvgdHIZHZpf9vA/QQpGUXRWx2qUsWSMpwxxDSYGLkyvr0dvG4Bvhaa1Dwqmm5j2GltNn Z4hS0Y7o682dTC7fpdMVclMrZaSVEdlzjD5mjtBybM8cLXVXVyXoqEwlIxGJ0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638570456; a=rsa-sha256; cv=none; b=GYRJa3Wt9YYX/Xb/VIIsOOzvFSPbvM4DeSSrUl3fgLVJe6OGpkznwBwvwhsjkCIbpTCWB5 q25XSefpFplxq3N67ALPZo/Ar54g2eY6Mc078d5UG2sG5UPmvTWe7bz8iVS8WC+QUnydet kG8JuKcrpFRVwQJONPjleh+zM+MWZ6D4LhwwGkvRxGhcfz5K9rPZcutC4PGyXV4pxUx9Xf GiEzj64Kqz4ki2oX9jax3YzMoCYBpjVNE+Cl3ncS4vZhjYlFjw47x/R4FRa3ZbxtA/1DNL xTsH7O/SPi2Cu2sSY8vI2y/+SSR67Vo/GbtcObs+xUFY2UE0BeXv39QYh8cS4g== 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=bca8e8c00c4ed9d5a52943f3b58d6f2238f4dd74 commit bca8e8c00c4ed9d5a52943f3b58d6f2238f4dd74 Author: Scott Long AuthorDate: 2021-12-03 22:22:47 +0000 Commit: Scott Long CommitDate: 2021-12-03 22:26:57 +0000 Fix "set but not used" in arcmsr Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/arcmsr/arcmsr.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 31d12f0ffd40..1799e1042316 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -622,12 +622,8 @@ static int arcmsr_resume(device_t dev) */ static void arcmsr_async(void *cb_arg, u_int32_t code, struct cam_path *path, void *arg) { - struct AdapterControlBlock *acb; u_int8_t target_id, target_lun; - struct cam_sim *sim; - sim = (struct cam_sim *) cb_arg; - acb =(struct AdapterControlBlock *) cam_sim_softc(sim); switch (code) { case AC_LOST_DEVICE: target_id = xpt_path_target_id(path); @@ -635,7 +631,6 @@ static void arcmsr_async(void *cb_arg, u_int32_t code, struct cam_path *path, vo if((target_id > ARCMSR_MAX_TARGETID) || (target_lun > ARCMSR_MAX_TARGETLUN)) { break; } - // printf("%s:scsi id=%d lun=%d device lost \n", device_get_name(acb->pci_dev), target_id, target_lun); break; default: break; @@ -5073,14 +5068,13 @@ static int arcmsr_probe(device_t dev) static int arcmsr_shutdown(device_t dev) { u_int32_t i; - u_int32_t intmask_org; struct CommandControlBlock *srb; struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev); /* stop adapter background rebuild */ ARCMSR_LOCK_ACQUIRE(&acb->isr_lock); /* disable all outbound interrupt */ - intmask_org = arcmsr_disable_allintr(acb); + arcmsr_disable_allintr(acb); arcmsr_stop_adapter_bgrb(acb); arcmsr_flush_adapter_cache(acb); /* abort all outstanding command */