From nobody Wed Apr 13 23:09:23 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 EC5471B40450; Wed, 13 Apr 2022 23:09:23 +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 4Kdyw32mj3z4lyp; Wed, 13 Apr 2022 23:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891363; 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=bF1angpGZlhsGXh1aKf1h63aDwKAufnnsVgu9bSe1r8=; b=K0RYJ4dSqHTPL/sZXmHh5Pu9YE4IQnY+qh+xyaOw/afeg3E+KNzr/j4nUGi+aHWuGzvfeS v5cStlpLsH1Dz75I8t3kElSFy4gApsil/DMwLNu6QRBnu3eDSSXkTC+U14oT++9M5lgJR0 NBVk8fJcm1Mv3tESn7uz4LTCldBCQTc34umOnBbLu/GqU4UCdbekHzmIye1MTZe2qlRsTw dAjU1qK1GzjBGsk2wCl+uXQjd81TEL22jaJjpPFqgT5O9q+JscNwVZZ/KVQISqc+inNZ4W p+IYCQeE1h5i3lpCoqX+bH+2zOiOxah6LTlKVC/xxWK+wk9d1oxfMIIur6UR1Q== 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 375BC1525E; Wed, 13 Apr 2022 23:09:23 +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 23DN9Nbp074313; Wed, 13 Apr 2022 23:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DN9Nb4074312; Wed, 13 Apr 2022 23:09:23 GMT (envelope-from git) Date: Wed, 13 Apr 2022 23:09:23 GMT Message-Id: <202204132309.23DN9Nb4074312@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: 03d49ffc78a6 - main - sdhci_card_task: d is only used in the non-MMCCAM case. 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: 03d49ffc78a6a9dc764acea44f8c214b8bf4a05b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649891363; 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=bF1angpGZlhsGXh1aKf1h63aDwKAufnnsVgu9bSe1r8=; b=Dv03EksD+cAjYA54sfuxQKs4IVEn+1yxMBks+K6LTKs4tb1Teh9WRs5ZR8dTHN3C+bs0yJ Tmhao8YDA5Xnqs7ut3dEyYC0C5Nw79DhIWM/csUERASVo9wncz6xG604HaP6DXgq4YtDZz ttL5pFeildiOS0xqC69qWs02Vdnbm96jR+iC1WH24f2uCsVUG7U9WmdFMKkvgpH+bKvIwW H/0IpYb+708JNnT9UWY8nU7JMDB+2VYFlc3CBF+V/4Cw6Whe6bVB0P0avZWDFVd0/OrRMa wej5g90fRsmF/dGbeWEE/0oY5y+ztE7+L/Wjv9gHfl2tQmBvIDZ+/XChljb6ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649891363; a=rsa-sha256; cv=none; b=IORh9ITelFBRfCSwFuJvl7ygemzFUQqOfXLIYmVtpC4fEwOE+Q3TRJwuU3AbP4Ox2Lq3uG fqUljj0Bf/mCay2qDCIvHEnyXIBNMnNqHfm9xnBlFReyzSmAKBMZP3Lf8MrfHMXVqAuZVd /sPfUJiz0Kq5WFAAVx+n7a1+//heZpe1FAXywmBV3aj8thFaTdCeBRijGNWzhzRN/pF581 3FogqrGu1ajPaAi5y6dgUXdO/kP/ueRm1NbWn0oELaGxF2sZBpvwC5XDVPFbFktkk9AZJm bBwtbyX/CMrFTxxxLSxBrfNXXuLvkKz5kBec2TT6EVCR7h443QO+K/91xGpmxw== 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=03d49ffc78a6a9dc764acea44f8c214b8bf4a05b commit 03d49ffc78a6a9dc764acea44f8c214b8bf4a05b Author: John Baldwin AuthorDate: 2022-04-13 23:08:20 +0000 Commit: John Baldwin CommitDate: 2022-04-13 23:08:20 +0000 sdhci_card_task: d is only used in the non-MMCCAM case. --- sys/dev/sdhci/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 0438e6afc8d9..d8532b132ac5 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -683,7 +683,9 @@ static void sdhci_card_task(void *arg, int pending __unused) { struct sdhci_slot *slot = arg; +#ifndef MMCCAM device_t d; +#endif SDHCI_LOCK(slot); if (SDHCI_GET_CARD_PRESENT(slot->bus, slot)) { @@ -714,11 +716,11 @@ sdhci_card_task(void *arg, int pending __unused) if (slot->card_present == 1) { #else if (slot->dev != NULL) { + d = slot->dev; #endif /* If no card present - detach mmc bus. */ if (bootverbose || sdhci_debug) slot_printf(slot, "Card removed\n"); - d = slot->dev; slot->dev = NULL; #ifdef MMCCAM slot->card_present = 0;