summaryrefslogtreecommitdiff
path: root/sys/scsi/st.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-02-05 16:29:31 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-02-05 16:29:31 +0000
commit2bd78861daf04f2a8a138592f716ee616c54cb44 (patch)
tree1ee27bd5a5d19fecc05c1cffd83b894f58bf7044 /sys/scsi/st.c
parent9b9477743c82bfd5aa1afc14395edd7cbfacbaec (diff)
Nuke unnecessary abstraction 'scsi_minphys()' which just calls
'minphys()'. Just use & check for NULL instead, since 'minphys()' is always called on the code path ([cd|sd|st]minphys) that calls physio().
Diffstat (limited to 'sys/scsi/st.c')
-rw-r--r--sys/scsi/st.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 027a31fb262..81138969d5f 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.175 2020/01/27 07:41:02 krw Exp $ */
+/* $OpenBSD: st.c,v 1.176 2020/02/05 16:29:30 krw Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -1008,9 +1008,10 @@ stminphys(struct buf *bp)
return;
link = sc->sc_link;
- (*link->adapter->dev_minphys)(bp, link);
- if (link->adapter->dev_minphys != scsi_minphys)
- scsi_minphys(bp, link);
+ if (link->adapter->dev_minphys != NULL)
+ (*link->adapter->dev_minphys)(bp, link);
+
+ minphys(bp);
device_unref(&sc->sc_dev);
}