From nobody Wed Apr 13 23:09:50 2022 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 A48EE1B4153F; Wed, 13 Apr 2022 23:09:52 +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 4Kdywb3sVhz4mDm; Wed, 13 Apr 2022 23:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891392; 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=SaIALJyQUAjaCUqe9gmQqgLreixeBzY0bBoZHEG+2HQ=; b=TfzPvpGl14jTaR1YV4wzySWi52hLfHs7Lfk4A2GdfKOZNfUzMsW8Ub8tgf0sODs9g4h835 N4MQPBZv5yNWaz++fAUf6CKuUsUH55WilBxCGt7ks0NQxTHIewtOyqz/iMNLGuxck+nJIA A4nNI0ma/KKZPPVFHa5PeCnzZM379DhSUoqbom7hkoX9vv3r87DKbeV9FuW/AHttEKKwaI RWfxwWq9YesIPQHuUSFTHN85Ho+yv5RKrv3O6NyK6sHD8zNro7p85GiRJNw/EozQ0gaLiz TLkyoxBQOXkKi79ck2PsZ2CkfiNm3Z9rxo0x6F/0PTgwDiQM/duaocF5TcXZbg== 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 F1C7215406; Wed, 13 Apr 2022 23:09:50 +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 23DN9o3C074913; Wed, 13 Apr 2022 23:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9oHV074912; Wed, 13 Apr 2022 23:09:50 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:50 GMT Message-Id: <202204132309.23DN9oHV074912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ead64e845440 - main - flash: Remove unused variables. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ead64e84544012f569ad5b28f36915dba26d6fa7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891392; 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=SaIALJyQUAjaCUqe9gmQqgLreixeBzY0bBoZHEG+2HQ=; b=XuCg/Yvk29D60atK98ZYlITQwuU+0CCqCNIBPruuYJbixi2IrF+I7dmc5KdGU7o80UiPum NNrvGsC+6Z4vWJASaLcK6MbgsXdCIIpckJzncu0BMdCEqpJSrzq5P+zbl9VbREkwgxsuUN JWCedIOAQWXxK6vpk4cbN2SIFZDlhF0uw/Tx8BAYvGtWX5yybtj7pgaSQDcS1qjEcwwmdc XqCgb4qKorsee+0niqHqZuqAydPWI/usg1GaTSc8xfIFoYPZa/zRcQRRvENVRtRTmyEQkD LigPWoEZDhsglBn7ZTEzAWrSrrt1xqSuxQ+8tsQy3PeQ7k/ERJaLNvS7vAkz/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891392; a=rsa-sha256; cv=none; b=s0x6aDMzkO44AqMY9788iY2hlAK7Yu5kq15ah4yT2jIW98U0BRsftuBBNXE9yh/DDZmrSb jMORyPau/MyMtnI/4yGFFGNgO9BmPGRKi1shxhK9ASyeDun5UAo2QFpOCIOfj865xKIECl BEfCsRbSdZgNeNq3trv+yjiU1o3e07nvThjDP2IXdwRPsQvbD2eJP2gY8mxIXRxSVwmrQd 35Md0xoMvwmOWWOBJKt+WboCg3kdS88yL/wHX6Rpz0FfYUMEC1KDa/eDn4xyi+FG6JzPSw pzYwVoqXFr04LGK1tNcEqa4pC/Uq9PfXz6sahbRPBBr9yq3tMrnrNUMiBCk5EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ead64e84544012f569ad5b28f36915dba26d6fa7 commit ead64e84544012f569ad5b28f36915dba26d6fa7 Author: John Baldwin AuthorDate: 2022-04-13 23:08:22 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:22 +0000 flash: Remove unused variables. --- sys/dev/flash/cqspi.c | 10 ++++------ sys/dev/flash/n25q.c | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/dev/flash/cqspi.c b/sys/dev/flash/cqspi.c index 54752792798d..b1b1f4cbc7ad 100644 --- a/sys/dev/flash/cqspi.c +++ b/sys/dev/flash/cqspi.c @@ -336,10 +336,9 @@ static int cqspi_wait_ready(struct cqspi_softc *sc) { uint8_t data; - int ret; do { - ret = cqspi_cmd_read(sc, CMD_READ_STATUS, &data, 1); + cqspi_cmd_read(sc, CMD_READ_STATUS, &data, 1); } while (data & STATUS_WIP); return (0); @@ -392,17 +391,16 @@ static int cqspi_erase(device_t dev, device_t child, off_t offset) { struct cqspi_softc *sc; - int ret; sc = device_get_softc(dev); cqspi_wait_idle(sc); cqspi_wait_ready(sc); - ret = cqspi_cmd_write(sc, CMD_WRITE_ENABLE, 0, 0); + cqspi_cmd_write(sc, CMD_WRITE_ENABLE, 0, 0); cqspi_wait_idle(sc); cqspi_wait_ready(sc); - ret = cqspi_cmd_write_addr(sc, CMD_QUAD_SECTOR_ERASE, offset, 4); + cqspi_cmd_write_addr(sc, CMD_QUAD_SECTOR_ERASE, offset, 4); cqspi_wait_idle(sc); @@ -422,7 +420,7 @@ cqspi_write(device_t dev, device_t child, struct bio *bp, sc = device_get_softc(dev); cqspi_wait_ready(sc); - reg = cqspi_cmd_write(sc, CMD_WRITE_ENABLE, 0, 0); + cqspi_cmd_write(sc, CMD_WRITE_ENABLE, 0, 0); cqspi_wait_idle(sc); cqspi_wait_ready(sc); diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c index cf7bfeef1ee1..b64d3fa57474 100644 --- a/sys/dev/flash/n25q.c +++ b/sys/dev/flash/n25q.c @@ -189,12 +189,10 @@ n25q_get_device_ident(struct n25q_softc *sc) static int n25q_write(device_t dev, struct bio *bp, off_t offset, caddr_t data, off_t count) { - struct n25q_softc *sc; device_t pdev; int err; pdev = device_get_parent(dev); - sc = device_get_softc(dev); dprintf("%s: offset 0x%llx count %lld bytes\n", __func__, offset, count); @@ -239,12 +237,10 @@ n25q_read(device_t dev, struct bio *bp, off_t offset, caddr_t data, off_t count) static int n25q_set_4b_mode(device_t dev, uint8_t command) { - struct n25q_softc *sc; device_t pdev; int err; pdev = device_get_parent(dev); - sc = device_get_softc(dev); err = QSPI_WRITE_REG(pdev, dev, command, 0, 0);