From 539f80d2dc71ca492f3c90298526e2482443dbed Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Sun, 26 Jan 2020 00:53:32 +0000 Subject: Shuffle some names around to make reading the code less headache inducing. Rename scsi_adapter member 'scsi_minphys' to 'dev_minphys' to reflect what it is supposed to do. Use consistent naming convention (_minphys) for the actual device functions. No functional change. --- sys/scsi/cd.c | 6 +++--- sys/scsi/mpath.c | 4 ++-- sys/scsi/scsiconf.h | 4 ++-- sys/scsi/sd.c | 6 +++--- sys/scsi/st.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'sys/scsi') diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 63c792c0a20..42ce3a0bd9d 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.241 2020/01/25 21:40:34 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.242 2020/01/26 00:53:31 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -693,8 +693,8 @@ cdminphys(struct buf *bp) bp->b_bcount = max; } - (*sc->sc_link->adapter->scsi_minphys)(bp, sc->sc_link); - if (sc->sc_link->adapter->scsi_minphys != scsi_minphys) + (*sc->sc_link->adapter->dev_minphys)(bp, sc->sc_link); + if (sc->sc_link->adapter->dev_minphys != scsi_minphys) scsi_minphys(bp, sc->sc_link); device_unref(&sc->sc_dev); diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index f7518bba80e..4c21573db5f 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.44 2020/01/23 07:53:00 krw Exp $ */ +/* $OpenBSD: mpath.c,v 1.45 2020/01/26 00:53:31 krw Exp $ */ /* * Copyright (c) 2009 David Gwynne @@ -409,7 +409,7 @@ mpath_minphys(struct buf *bp, struct scsi_link *link) TAILQ_FOREACH(g, &d->d_groups, g_entry) { TAILQ_FOREACH(p, &g->g_paths, p_entry) { /* XXX crossing layers with mutex held */ - p->p_link->adapter->scsi_minphys(bp, p->p_link); + p->p_link->adapter->dev_minphys(bp, p->p_link); } } mtx_leave(&d->d_mtx); diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 89fcc1dab13..cc5243dc115 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.182 2019/12/08 13:05:12 krw Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.183 2020/01/26 00:53:31 krw Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -241,7 +241,7 @@ extern int scsi_autoconf; */ struct scsi_adapter { void (*scsi_cmd)(struct scsi_xfer *); - void (*scsi_minphys)(struct buf *, struct scsi_link *); + void (*dev_minphys)(struct buf *, struct scsi_link *); int (*dev_probe)(struct scsi_link *); void (*dev_free)(struct scsi_link *); int (*ioctl)(struct scsi_link *, u_long, caddr_t, int); diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 53316de093f..507c97d9913 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.307 2020/01/25 21:40:35 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.308 2020/01/26 00:53:31 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -832,8 +832,8 @@ sdminphys(struct buf *bp) bp->b_bcount = max; } - (*link->adapter->scsi_minphys)(bp, link); - if (link->adapter->scsi_minphys != scsi_minphys) + (*link->adapter->dev_minphys)(bp, link); + if (link->adapter->dev_minphys != scsi_minphys) scsi_minphys(bp, link); device_unref(&sc->sc_dev); diff --git a/sys/scsi/st.c b/sys/scsi/st.c index c5589361b5c..804fda26b20 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.173 2020/01/25 21:40:35 krw Exp $ */ +/* $OpenBSD: st.c,v 1.174 2020/01/26 00:53:31 krw Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -1006,8 +1006,8 @@ stminphys(struct buf *bp) if (st == NULL) return; - (*st->sc_link->adapter->scsi_minphys)(bp, st->sc_link); - if (st->sc_link->adapter->scsi_minphys != scsi_minphys) + (*st->sc_link->adapter->dev_minphys)(bp, st->sc_link); + if (st->sc_link->adapter->dev_minphys != scsi_minphys) scsi_minphys(bp, st->sc_link); device_unref(&st->sc_dev); -- cgit v1.2.3