From owner-dev-commits-src-main@freebsd.org Thu Jun 3 19:08:40 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E6DE63F351;
Thu, 3 Jun 2021 19:08:40 +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 4FwwRD0DChz4fyb;
Thu, 3 Jun 2021 19:08:40 +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 E46766EE4;
Thu, 3 Jun 2021 19:08:39 +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 153J8dJr068686;
Thu, 3 Jun 2021 19:08:39 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 153J8dMG068685;
Thu, 3 Jun 2021 19:08:39 GMT (envelope-from git)
Date: Thu, 3 Jun 2021 19:08:39 GMT
Message-Id: <202106031908.153J8dMG068685@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: cc384c67ce2b - main - cam: prefer cam_sim_softc() over accessing
cam_sim structure directly.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: cc384c67ce2b6b0b30e08a264d4ef9a116e70505
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jun 2021 19:08:40 -0000
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=cc384c67ce2b6b0b30e08a264d4ef9a116e70505
commit cc384c67ce2b6b0b30e08a264d4ef9a116e70505
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-06-03 19:05:20 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-06-03 19:08:29 +0000
cam: prefer cam_sim_softc() over accessing cam_sim structure directly.
Use the accessor function to get the softc for this sim. This also drops
an unneeded cast.
Sponsored by: Netflix
Reviewed by: mav@, hselasky@
Differential Revision: https://reviews.freebsd.org/D30360
---
sys/dev/firewire/sbp.c | 4 ++--
sys/dev/usb/storage/umass.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 58e2086399d2..a161713a94ad 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -2273,7 +2273,7 @@ static void
sbp_action(struct cam_sim *sim, union ccb *ccb)
{
- struct sbp_softc *sbp = (struct sbp_softc *)sim->softc;
+ struct sbp_softc *sbp = cam_sim_softc(sim);
struct sbp_target *target = NULL;
struct sbp_dev *sdev = NULL;
@@ -2632,7 +2632,7 @@ sbp_poll(struct cam_sim *sim)
struct sbp_softc *sbp;
struct firewire_comm *fc;
- sbp = (struct sbp_softc *)sim->softc;
+ sbp = cam_sim_softc(sim);
fc = sbp->fd.fc;
fc->poll(fc, 0, -1);
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index 8260226e5d12..bc07fe50b6ab 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -2157,7 +2157,7 @@ umass_cam_detach_sim(struct umass_softc *sc)
static void
umass_cam_action(struct cam_sim *sim, union ccb *ccb)
{
- struct umass_softc *sc = (struct umass_softc *)sim->softc;
+ struct umass_softc *sc = cam_sim_softc(sim);
if (sc == NULL) {
ccb->ccb_h.status = CAM_SEL_TIMEOUT;
@@ -2433,7 +2433,7 @@ done:
static void
umass_cam_poll(struct cam_sim *sim)
{
- struct umass_softc *sc = (struct umass_softc *)sim->softc;
+ struct umass_softc *sc = cam_sim_softc(sim);
if (sc == NULL)
return;