summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/sparc64/dev/vdsk.c4
-rw-r--r--sys/dev/ata/atascsi.c4
-rw-r--r--sys/dev/ic/adv.c6
-rw-r--r--sys/dev/ic/adw.c4
-rw-r--r--sys/dev/ic/ami.c10
-rw-r--r--sys/dev/ic/cac.c8
-rw-r--r--sys/dev/ic/ciss.c8
-rw-r--r--sys/dev/ic/gdt_common.c8
-rw-r--r--sys/dev/ic/gdtvar.h4
-rw-r--r--sys/dev/ic/iha.c4
-rw-r--r--sys/dev/ic/mfi.c12
-rw-r--r--sys/dev/ic/trm.c4
-rw-r--r--sys/dev/ic/twe.c6
-rw-r--r--sys/dev/ic/twevar.h4
-rw-r--r--sys/dev/ic/uha.c8
-rw-r--r--sys/dev/isa/wds.c8
-rw-r--r--sys/dev/pv/hvs.c2
-rw-r--r--sys/dev/pv/vioblk.c4
-rw-r--r--sys/dev/pv/xbf.c4
-rw-r--r--sys/dev/sdmmc/sdmmc_scsi.c8
-rw-r--r--sys/dev/usb/umass_scsi.c8
-rw-r--r--sys/scsi/cd.c6
-rw-r--r--sys/scsi/mpath.c4
-rw-r--r--sys/scsi/scsiconf.h4
-rw-r--r--sys/scsi/sd.c6
-rw-r--r--sys/scsi/st.c6
26 files changed, 77 insertions, 77 deletions
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index f3670e51cc1..6e423f63710 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vdsk.c,v 1.49 2018/01/17 15:52:34 stsp Exp $ */
+/* $OpenBSD: vdsk.c,v 1.50 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2009, 2011 Mark Kettenis
*
@@ -344,7 +344,7 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
scsi_iopool_init(&sc->sc_iopool, sc, vdsk_io_get, vdsk_io_put);
sc->sc_switch.scsi_cmd = vdsk_scsi_cmd;
- sc->sc_switch.scsi_minphys = scsi_minphys;
+ sc->sc_switch.dev_minphys = scsi_minphys;
sc->sc_switch.dev_probe = vdsk_dev_probe;
sc->sc_switch.dev_free = vdsk_dev_free;
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index f1ae3de98a5..d5d0435a1ee 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.c,v 1.131 2020/01/23 07:52:59 krw Exp $ */
+/* $OpenBSD: atascsi.c,v 1.132 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -177,7 +177,7 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa)
/* copy from template and modify for ourselves */
as->as_switch = atascsi_switch;
if (aaa->aaa_minphys != NULL)
- as->as_switch.scsi_minphys = aaa->aaa_minphys;
+ as->as_switch.dev_minphys = aaa->aaa_minphys;
/* fill in our scsi_link */
as->as_link.adapter = &as->as_switch;
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 7609f164989..d9b036cffc4 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.39 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: adv.c,v 1.40 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -66,7 +66,7 @@ static void adv_start_ccbs(ASC_SOFTC *);
static u_int8_t *adv_alloc_overrunbuf(char *dvname, bus_dma_tag_t);
static void adv_scsi_cmd(struct scsi_xfer *);
-static void advminphys(struct buf *, struct scsi_link *);
+static void adv_minphys(struct buf *, struct scsi_link *);
static void adv_narrow_isr_callback(ASC_SOFTC *, ASC_QDONE_INFO *);
static int adv_poll(ASC_SOFTC *, struct scsi_xfer *, int);
@@ -83,7 +83,7 @@ struct cfdriver adv_cd = {
struct scsi_adapter adv_switch = {
- adv_scsi_cmd, advminphys, NULL, NULL, NULL
+ adv_scsi_cmd, adv_minphys, NULL, NULL, NULL
};
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index 0761a79c8b3..f441bef19f1 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.56 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: adw.c,v 1.57 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -503,7 +503,7 @@ adw_attach(ADW_SOFTC *sc)
* Fill in the adapter.
*/
sc->sc_adapter.scsi_cmd = adw_scsi_cmd;
- sc->sc_adapter.scsi_minphys = adw_minphys;
+ sc->sc_adapter.dev_minphys = adw_minphys;
/*
* fill in the prototype scsi_link.
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index ba41480e8d2..b9425ffc6d0 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.239 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: ami.c,v 1.240 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -95,16 +95,16 @@ struct cfdriver ami_cd = {
void ami_scsi_cmd(struct scsi_xfer *);
int ami_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
-void amiminphys(struct buf *bp, struct scsi_link *sl);
+void ami_minphys(struct buf *bp, struct scsi_link *sl);
struct scsi_adapter ami_switch = {
- ami_scsi_cmd, amiminphys, NULL, NULL, ami_scsi_ioctl
+ ami_scsi_cmd, ami_minphys, NULL, NULL, ami_scsi_ioctl
};
void ami_scsi_raw_cmd(struct scsi_xfer *);
struct scsi_adapter ami_raw_switch = {
- ami_scsi_raw_cmd, amiminphys, NULL, NULL, NULL
+ ami_scsi_raw_cmd, ami_minphys, NULL, NULL, NULL
};
void * ami_get_ccb(void *);
@@ -1191,7 +1191,7 @@ ami_done_init(struct ami_softc *sc, struct ami_ccb *ccb)
}
void
-amiminphys(struct buf *bp, struct scsi_link *sl)
+ami_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > AMI_MAXFER)
bp->b_bcount = AMI_MAXFER;
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index d26f2e0b859..690f1e86c6e 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cac.c,v 1.57 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: cac.c,v 1.58 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $ */
/*
@@ -96,10 +96,10 @@ struct cfdriver cac_cd = {
};
void cac_scsi_cmd(struct scsi_xfer *);
-void cacminphys(struct buf *bp, struct scsi_link *sl);
+void cac_minphys(struct buf *bp, struct scsi_link *sl);
struct scsi_adapter cac_switch = {
- cac_scsi_cmd, cacminphys, NULL, NULL, NULL
+ cac_scsi_cmd, cac_minphys, NULL, NULL, NULL
};
void *cac_ccb_alloc(void *);
@@ -562,7 +562,7 @@ cac_get_dinfo(sc, target)
}
void
-cacminphys(struct buf *bp, struct scsi_link *sl)
+cac_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > CAC_MAX_XFER)
bp->b_bcount = CAC_MAX_XFER;
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index efb92008134..44cd8cead25 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciss.c,v 1.79 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: ciss.c,v 1.80 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2005,2006 Michael Shalayeff
@@ -68,10 +68,10 @@ struct cfdriver ciss_cd = {
void ciss_scsi_cmd(struct scsi_xfer *xs);
int ciss_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
-void cissminphys(struct buf *bp, struct scsi_link *sl);
+void ciss_minphys(struct buf *bp, struct scsi_link *sl);
struct scsi_adapter ciss_switch = {
- ciss_scsi_cmd, cissminphys, NULL, NULL, ciss_scsi_ioctl
+ ciss_scsi_cmd, ciss_minphys, NULL, NULL, ciss_scsi_ioctl
};
#if NBIO > 0
@@ -423,7 +423,7 @@ ciss_shutdown(void *v)
}
void
-cissminphys(struct buf *bp, struct scsi_link *sl)
+ciss_minphys(struct buf *bp, struct scsi_link *sl)
{
#if 0 /* TODO */
#define CISS_MAXFER (PAGE_SIZE * (sc->maxsg + 1))
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 311352574d7..c37abb3b6a0 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdt_common.c,v 1.66 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: gdt_common.c,v 1.67 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 1999, 2000, 2003 Niklas Hallqvist. All rights reserved.
@@ -93,7 +93,7 @@ struct cfdriver gdt_cd = {
};
struct scsi_adapter gdt_switch = {
- gdt_scsi_cmd, gdtminphys, NULL, NULL, NULL
+ gdt_scsi_cmd, gdt_minphys, NULL, NULL, NULL
};
int gdt_cnt = 0;
@@ -1094,9 +1094,9 @@ gdt_intr(void *arg)
}
void
-gdtminphys(struct buf *bp, struct scsi_link *sl)
+gdt_minphys(struct buf *bp, struct scsi_link *sl)
{
- GDT_DPRINTF(GDT_D_MISC, ("gdtminphys(0x%x) ", bp));
+ GDT_DPRINTF(GDT_D_MISC, ("gdt_minphys(0x%x) ", bp));
/* As this is way more than MAXPHYS it's really not necessary. */
if ((GDT_MAXOFFSETS - 1) * PAGE_SIZE < MAXPHYS &&
diff --git a/sys/dev/ic/gdtvar.h b/sys/dev/ic/gdtvar.h
index ba50513e2c8..ec5e4b9d09a 100644
--- a/sys/dev/ic/gdtvar.h
+++ b/sys/dev/ic/gdtvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gdtvar.h,v 1.22 2013/03/04 00:41:54 dlg Exp $ */
+/* $OpenBSD: gdtvar.h,v 1.23 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved.
@@ -236,7 +236,7 @@ struct gdt_softc {
int (*sc_test_busy)(struct gdt_softc *);
};
-void gdtminphys(struct buf *, struct scsi_link *);
+void gdt_minphys(struct buf *, struct scsi_link *);
int gdt_attach(struct gdt_softc *);
int gdt_intr(void *);
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 1678f01a4af..6e0a5d88c0e 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iha.c,v 1.45 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: iha.c,v 1.46 2020/01/26 00:53:31 krw Exp $ */
/*-------------------------------------------------------------------------
*
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -446,7 +446,7 @@ iha_init_tulip(struct iha_softc *sc)
* iha_minphys - reduce bp->b_bcount to something less than
* or equal to the largest I/O possible through
* the adapter. Called from higher layers
- * via sc->sc_adapter.scsi_minphys.
+ * via sc->sc_adapter.dev_minphys.
*/
void
iha_minphys(struct buf *bp, struct scsi_link *sl)
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 35d1ed3e35c..e64b3b358c3 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.173 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.174 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
*
@@ -58,17 +58,17 @@ struct cfdriver mfi_cd = {
void mfi_scsi_cmd(struct scsi_xfer *);
int mfi_scsi_ioctl(struct scsi_link *, u_long, caddr_t, int);
int mfi_ioctl_cache(struct scsi_link *, u_long, struct dk_cache *);
-void mfiminphys(struct buf *bp, struct scsi_link *sl);
+void mfi_minphys(struct buf *bp, struct scsi_link *sl);
void mfi_pd_scsi_cmd(struct scsi_xfer *);
int mfi_pd_scsi_probe(struct scsi_link *);
struct scsi_adapter mfi_switch = {
- mfi_scsi_cmd, mfiminphys, NULL, NULL, mfi_scsi_ioctl
+ mfi_scsi_cmd, mfi_minphys, NULL, NULL, mfi_scsi_ioctl
};
struct scsi_adapter mfi_pd_switch = {
- mfi_pd_scsi_cmd, mfiminphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
+ mfi_pd_scsi_cmd, mfi_minphys, mfi_pd_scsi_probe, NULL, mfi_scsi_ioctl
};
void * mfi_get_ccb(void *);
@@ -660,9 +660,9 @@ mfi_get_info(struct mfi_softc *sc)
}
void
-mfiminphys(struct buf *bp, struct scsi_link *sl)
+mfi_minphys(struct buf *bp, struct scsi_link *sl)
{
- DNPRINTF(MFI_D_MISC, "mfiminphys: %d\n", bp->b_bcount);
+ DNPRINTF(MFI_D_MISC, "mfi_minphys: %d\n", bp->b_bcount);
/* XXX currently using MFI_MAXFER = MAXPHYS */
if (bp->b_bcount > MFI_MAXFER)
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c
index 7f7c558d664..5fdf6ecffb0 100644
--- a/sys/dev/ic/trm.c
+++ b/sys/dev/ic/trm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trm.c,v 1.35 2020/01/25 21:48:42 krw Exp $
+/* $OpenBSD: trm.c,v 1.36 2020/01/26 00:53:31 krw Exp $
* ------------------------------------------------------------
* O.S : OpenBSD
* File Name : trm.c
@@ -2430,7 +2430,7 @@ trm_initACB(struct trm_softc *sc, int unit)
}
sc->sc_adapter.scsi_cmd = trm_scsi_cmd;
- sc->sc_adapter.scsi_minphys = trm_minphys;
+ sc->sc_adapter.dev_minphys = trm_minphys;
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_AdaptSCSIID;
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 27fa7f09395..61637da28cb 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: twe.c,v 1.49 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: twe.c,v 1.50 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved.
@@ -65,7 +65,7 @@ struct cfdriver twe_cd = {
void twe_scsi_cmd(struct scsi_xfer *);
struct scsi_adapter twe_switch = {
- twe_scsi_cmd, tweminphys, NULL, NULL, NULL
+ twe_scsi_cmd, twe_minphys, NULL, NULL, NULL
};
void *twe_get_ccb(void *);
@@ -753,7 +753,7 @@ twe_done(sc, ccb)
}
void
-tweminphys(struct buf *bp, struct scsi_link *sl)
+twe_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > TWE_MAXFER)
bp->b_bcount = TWE_MAXFER;
diff --git a/sys/dev/ic/twevar.h b/sys/dev/ic/twevar.h
index 77203b1fdc2..4fe62116691 100644
--- a/sys/dev/ic/twevar.h
+++ b/sys/dev/ic/twevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: twevar.h,v 1.10 2011/04/03 15:49:16 dlg Exp $ */
+/* $OpenBSD: twevar.h,v 1.11 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -87,6 +87,6 @@ struct twe_softc {
#define TWE_UNLOCK(sc, lock) splx(lock)
typedef int twe_lock_t;
-void tweminphys(struct buf *bp, struct scsi_link *sl);
+void twe_minphys(struct buf *bp, struct scsi_link *sl);
int twe_attach(struct twe_softc *);
int twe_intr(void *);
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 2313c64f5ff..94863f0a31e 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.28 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: uha.c,v 1.29 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -78,11 +78,11 @@
void uha_reset_mscp(struct uha_softc *, struct uha_mscp *);
void uha_mscp_free(void *, void *);
void *uha_mscp_alloc(void *);
-void uhaminphys(struct buf *, struct scsi_link *);
+void uha_minphys(struct buf *, struct scsi_link *);
void uha_scsi_cmd(struct scsi_xfer *);
struct scsi_adapter uha_switch = {
- uha_scsi_cmd, uhaminphys, NULL, NULL, NULL
+ uha_scsi_cmd, uha_minphys, NULL, NULL, NULL
};
struct cfdriver uha_cd = {
@@ -261,7 +261,7 @@ uha_done(sc, mscp)
}
void
-uhaminphys(struct buf *bp, struct scsi_link *sl)
+uha_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > ((UHA_NSEG - 1) << PGSHIFT))
bp->b_bcount = ((UHA_NSEG - 1) << PGSHIFT);
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 30269681b9d..0d139ed6dd6 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.46 2020/01/25 21:48:42 krw Exp $ */
+/* $OpenBSD: wds.c,v 1.47 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -160,7 +160,7 @@ void wds_done(struct wds_softc *, struct wds_scb *, u_char);
int wds_find(struct isa_attach_args *, struct wds_softc *);
void wds_init(struct wds_softc *);
void wds_inquire_setup_information(struct wds_softc *);
-void wdsminphys(struct buf *, struct scsi_link *);
+void wds_minphys(struct buf *, struct scsi_link *);
void wds_scsi_cmd(struct scsi_xfer *);
void wds_sense(struct wds_softc *, struct wds_scb *);
int wds_poll(struct wds_softc *, struct scsi_xfer *, int);
@@ -169,7 +169,7 @@ void wds_timeout(void *);
int wdsprint(void *, const char *);
struct scsi_adapter wds_switch = {
- wds_scsi_cmd, wdsminphys, NULL, NULL, NULL
+ wds_scsi_cmd, wds_minphys, NULL, NULL, NULL
};
int wdsprobe(struct device *, void *, void *);
@@ -870,7 +870,7 @@ out:
}
void
-wdsminphys(struct buf *bp, struct scsi_link *sl)
+wds_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > ((WDS_NSEG - 1) << PGSHIFT))
bp->b_bcount = ((WDS_NSEG - 1) << PGSHIFT);
diff --git a/sys/dev/pv/hvs.c b/sys/dev/pv/hvs.c
index 5b8d7fdcf24..958149b7b53 100644
--- a/sys/dev/pv/hvs.c
+++ b/sys/dev/pv/hvs.c
@@ -306,7 +306,7 @@ hvs_attach(struct device *parent, struct device *self, void *aux)
task_set(&sc->sc_probetask, hvs_scsi_probe, sc);
sc->sc_switch.scsi_cmd = hvs_scsi_cmd;
- sc->sc_switch.scsi_minphys = scsi_minphys;
+ sc->sc_switch.dev_minphys = scsi_minphys;
sc->sc_link.adapter = &sc->sc_switch;
sc->sc_link.adapter_softc = self;
diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c
index 5a540427082..c7caec68fb8 100644
--- a/sys/dev/pv/vioblk.c
+++ b/sys/dev/pv/vioblk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vioblk.c,v 1.13 2019/05/26 15:20:04 sf Exp $ */
+/* $OpenBSD: vioblk.c,v 1.14 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2012 Stefan Fritsch.
@@ -227,7 +227,7 @@ vioblk_attach(struct device *parent, struct device *self, void *aux)
sc->sc_queued = 0;
sc->sc_switch.scsi_cmd = vioblk_scsi_cmd;
- sc->sc_switch.scsi_minphys = scsi_minphys;
+ sc->sc_switch.dev_minphys = scsi_minphys;
sc->sc_switch.dev_probe = vioblk_dev_probe;
sc->sc_switch.dev_free = vioblk_dev_free;
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index 07c7063de11..0c1950ff2cf 100644
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xbf.c,v 1.33 2020/01/22 02:02:31 cheloha Exp $ */
+/* $OpenBSD: xbf.c,v 1.34 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2016, 2017 Mike Belopuhov
@@ -299,7 +299,7 @@ xbf_attach(struct device *parent, struct device *self, void *aux)
}
sc->sc_switch.scsi_cmd = xbf_scsi_cmd;
- sc->sc_switch.scsi_minphys = scsi_minphys;
+ sc->sc_switch.dev_minphys = scsi_minphys;
sc->sc_switch.dev_probe = xbf_dev_probe;
sc->sc_link.adapter = &sc->sc_switch;
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index b6c175f013f..0ad8ec6ca08 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdmmc_scsi.c,v 1.43 2020/01/25 21:48:43 krw Exp $ */
+/* $OpenBSD: sdmmc_scsi.c,v 1.44 2020/01/26 00:53:31 krw Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -92,7 +92,7 @@ void sdmmc_start_xs(struct sdmmc_softc *, struct sdmmc_ccb *);
void sdmmc_complete_xs(void *);
void sdmmc_done_xs(struct sdmmc_ccb *);
void sdmmc_stimeout(void *);
-void sdmmc_scsi_minphys(struct buf *, struct scsi_link *);
+void sdmmc_minphys(struct buf *, struct scsi_link *);
#ifdef SDMMC_DEBUG
#define DPRINTF(s) printf s
@@ -135,7 +135,7 @@ sdmmc_scsi_attach(struct sdmmc_softc *sc)
sc->sc_scsibus = scbus;
scbus->sc_adapter.scsi_cmd = sdmmc_scsi_cmd;
- scbus->sc_adapter.scsi_minphys = sdmmc_scsi_minphys;
+ scbus->sc_adapter.dev_minphys = sdmmc_minphys;
scbus->sc_link.adapter_target = SDMMC_SCSIID_HOST;
scbus->sc_link.adapter_buswidth = scbus->sc_ntargets;
@@ -545,7 +545,7 @@ sdmmc_stimeout(void *arg)
}
void
-sdmmc_scsi_minphys(struct buf *bp, struct scsi_link *sl)
+sdmmc_minphys(struct buf *bp, struct scsi_link *sl)
{
struct sdmmc_softc *sc = sl->adapter_softc;
struct sdmmc_scsi_softc *scbus = sc->sc_scsibus;
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 6226da74ad9..6eeb12ba931 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass_scsi.c,v 1.48 2020/01/25 21:48:43 krw Exp $ */
+/* $OpenBSD: umass_scsi.c,v 1.49 2020/01/26 00:53:31 krw Exp $ */
/* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -66,10 +66,10 @@ struct umass_scsi_softc {
int umass_scsi_probe(struct scsi_link *);
void umass_scsi_cmd(struct scsi_xfer *);
-void umass_scsi_minphys(struct buf *, struct scsi_link *);
+void umass_minphys(struct buf *, struct scsi_link *);
struct scsi_adapter umass_scsi_switch = {
- umass_scsi_cmd, umass_scsi_minphys, umass_scsi_probe, NULL, NULL
+ umass_scsi_cmd, umass_minphys, umass_scsi_probe, NULL, NULL
};
void umass_scsi_cb(struct umass_softc *sc, void *priv, int residue,
@@ -264,7 +264,7 @@ umass_scsi_cmd(struct scsi_xfer *xs)
}
void
-umass_scsi_minphys(struct buf *bp, struct scsi_link *sl)
+umass_minphys(struct buf *bp, struct scsi_link *sl)
{
if (bp->b_bcount > UMASS_MAX_TRANSFER_SIZE)
bp->b_bcount = UMASS_MAX_TRANSFER_SIZE;
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 <dlg@openbsd.org>
@@ -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);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 21:16:12 +0000