summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/fd.c5
-rw-r--r--sys/arch/sparc/dev/presto.c7
-rw-r--r--sys/arch/sparc/dev/xd.c9
-rw-r--r--sys/arch/sparc/dev/xy.c9
-rw-r--r--sys/arch/sparc64/dev/fd.c5
-rw-r--r--sys/dev/ata/wd.c5
-rw-r--r--sys/dev/flash.c5
-rw-r--r--sys/dev/isa/fd.c5
-rw-r--r--sys/dev/isa/mcd.c5
-rw-r--r--sys/dev/ramdisk.c4
-rw-r--r--sys/dev/vnd.c5
-rw-r--r--sys/scsi/cd.c5
-rw-r--r--sys/scsi/sd.c5
-rw-r--r--sys/sys/disk.h17
14 files changed, 14 insertions, 77 deletions
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index e92e7732f5f..5b9384a12ec 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.73 2010/08/17 20:05:06 miod Exp $ */
+/* $OpenBSD: fd.c,v 1.74 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -244,8 +244,6 @@ void fdstrategy(struct buf *);
void fdstart(struct fd_softc *);
int fdprint(void *, const char *);
-struct dkdriver fddkdriver = { fdstrategy };
-
struct fd_type *fd_nvtotype(char *, int, int);
void fd_set_motor(struct fdc_softc *fdc);
void fd_motor_off(void *arg);
@@ -644,7 +642,6 @@ fdattach(parent, self, aux)
* Initialize and attach the disk structure.
*/
fd->sc_dk.dk_name = fd->sc_dv.dv_xname;
- fd->sc_dk.dk_driver = &fddkdriver;
disk_attach(&fd->sc_dk);
/*
diff --git a/sys/arch/sparc/dev/presto.c b/sys/arch/sparc/dev/presto.c
index a2435094985..671b4e40de6 100644
--- a/sys/arch/sparc/dev/presto.c
+++ b/sys/arch/sparc/dev/presto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: presto.c,v 1.16 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: presto.c,v 1.17 2010/08/28 20:23:22 matthew Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
* All rights reserved.
@@ -82,10 +82,6 @@ struct cfdriver presto_cd = {
NULL, "presto", DV_DULL
};
-struct dkdriver presto_dk = {
- prestostrategy,
-};
-
int
presto_match(struct device *parent, void *vcf, void *aux)
{
@@ -164,7 +160,6 @@ presto_attach(struct device *parent, struct device *self, void *args)
*(u_int8_t *)(sc->sc_mem + 0x0b), *(u_int8_t *)(sc->sc_mem + 0x0f));
#endif
- sc->sc_dk.dk_driver = &presto_dk;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
disk_attach(&sc->sc_dk);
}
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index be6e2d52c10..ef989f96195 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xd.c,v 1.48 2010/05/23 10:49:19 dlg Exp $ */
+/* $OpenBSD: xd.c,v 1.49 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */
/*
@@ -269,12 +269,6 @@ struct xdc_attach_args { /* this is the "aux" args to xdattach */
};
/*
- * dkdriver
- */
-
-struct dkdriver xddkdriver = {xdstrategy};
-
-/*
* start: disk label fix code (XXX)
*/
@@ -562,7 +556,6 @@ xdattach(parent, self, aux)
* to start with a clean slate.
*/
bzero(&xd->sc_dk, sizeof(xd->sc_dk));
- xd->sc_dk.dk_driver = &xddkdriver;
xd->sc_dk.dk_name = xd->sc_dev.dv_xname;
/* if booting, init the xd_softc */
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index afabb170bec..2ff2a53d9a3 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xy.c,v 1.45 2010/05/23 10:49:19 dlg Exp $ */
+/* $OpenBSD: xy.c,v 1.46 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */
/*
@@ -209,12 +209,6 @@ struct xyc_attach_args { /* this is the "aux" args to xyattach */
};
/*
- * dkdriver
- */
-
-struct dkdriver xydkdriver = { xystrategy };
-
-/*
* start: disk label fix code (XXX)
*/
@@ -504,7 +498,6 @@ xyattach(parent, self, aux)
* to start with a clean slate.
*/
bzero(&xy->sc_dk, sizeof(xy->sc_dk));
- xy->sc_dk.dk_driver = &xydkdriver;
xy->sc_dk.dk_name = xy->sc_dev.dv_xname;
/* if booting, init the xy_softc */
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 7b1397c4961..f7fc4321e02 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.31 2010/05/19 04:10:34 dlg Exp $ */
+/* $OpenBSD: fd.c,v 1.32 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */
/*-
@@ -290,8 +290,6 @@ void fdstrategy(struct buf *);
void fdstart(struct fd_softc *);
int fdprint(void *, const char *);
-struct dkdriver fddkdriver = { fdstrategy };
-
struct fd_type *fd_nvtotype(char *, int, int);
void fd_set_motor(struct fdc_softc *fdc);
void fd_motor_off(void *arg);
@@ -670,7 +668,6 @@ fdattach(parent, self, aux)
* Initialize and attach the disk structure.
*/
fd->sc_dk.dk_name = fd->sc_dv.dv_xname;
- fd->sc_dk.dk_driver = &fddkdriver;
disk_attach(&fd->sc_dk);
/* Make sure the drive motor gets turned off at shutdown time. */
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 0184b8f1c9a..596d160829b 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.88 2010/07/23 07:47:13 jsg Exp $ */
+/* $OpenBSD: wd.c,v 1.89 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -177,8 +177,6 @@ void wd_flushcache(struct wd_softc *, int);
void wd_standby(struct wd_softc *, int);
void wd_shutdown(void *);
-struct dkdriver wddkdriver = { wdstrategy };
-
/* XXX: these should go elsewhere */
cdev_decl(wd);
bdev_decl(wd);
@@ -362,7 +360,6 @@ wdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize disk structures.
*/
- wd->sc_dk.dk_driver = &wddkdriver;
wd->sc_dk.dk_name = wd->sc_dev.dv_xname;
wd->sc_bufq = bufq_init(BUFQ_DEFAULT);
wd->sc_sdhook = shutdownhook_establish(wd_shutdown, wd);
diff --git a/sys/dev/flash.c b/sys/dev/flash.c
index ec5eebd53d4..7ca3df7808f 100644
--- a/sys/dev/flash.c
+++ b/sys/dev/flash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: flash.c,v 1.15 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: flash.c,v 1.16 2010/08/28 20:23:22 matthew Exp $ */
/*
* Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -95,8 +95,6 @@ struct cfdriver flash_cd = {
NULL, "flash", DV_DISK
};
-struct dkdriver flashdkdriver = { flashstrategy };
-
void
flashattach(struct flash_softc *sc, struct flash_ctl_tag *tag,
void *cookie)
@@ -158,7 +156,6 @@ flashattach(struct flash_softc *sc, struct flash_ctl_tag *tag,
/*
* Initialize and attach the disk structure.
*/
- sc->sc_dk.dk_driver = &flashdkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
disk_attach(&sc->sc_dk);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 1fac90cbff9..0244d952f27 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.85 2010/05/18 04:41:14 dlg Exp $ */
+/* $OpenBSD: fd.c,v 1.86 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -146,8 +146,6 @@ void fdstrategy(struct buf *);
void fdstart(struct fd_softc *);
int fdintr(struct fdc_softc *);
-struct dkdriver fddkdriver = { fdstrategy };
-
void fd_set_motor(struct fdc_softc *fdc, int reset);
void fd_motor_off(void *arg);
void fd_motor_on(void *arg);
@@ -306,7 +304,6 @@ fdattach(parent, self, aux)
* Initialize and attach the disk structure.
*/
fd->sc_dk.dk_name = fd->sc_dev.dv_xname;
- fd->sc_dk.dk_driver = &fddkdriver;
disk_attach(&fd->sc_dk);
/* Needed to power off if the motor is on when we halt. */
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 77384462158..677693a0f96 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mcd.c,v 1.53 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: mcd.c,v 1.54 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */
/*
@@ -226,8 +226,6 @@ int mcdlock(struct mcd_softc *);
void mcdunlock(struct mcd_softc *);
void mcd_pseudointr(void *);
-struct dkdriver mcddkdriver = { mcdstrategy };
-
#define MCD_RETRIES 3
#define MCD_RDRETRIES 3
@@ -271,7 +269,6 @@ mcdattach(parent, self, aux)
/*
* Initialize and attach the disk structure.
*/
- sc->sc_dk.dk_driver = &mcddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
disk_attach(&sc->sc_dk);
diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c
index 6d8469d1e33..7de7d1b0e81 100644
--- a/sys/dev/ramdisk.c
+++ b/sys/dev/ramdisk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ramdisk.c,v 1.46 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: ramdisk.c,v 1.47 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */
/*
@@ -126,7 +126,6 @@ struct cfattach rd_ca = {
};
void rdstrategy(struct buf *bp);
-struct dkdriver rddkdriver = { rdstrategy };
int ramdisk_ndevs;
void *ramdisk_devs[RD_MAX_UNITS];
@@ -205,7 +204,6 @@ rd_attach(struct device *parent, struct device *self, void *aux)
/*
* Initialize and attach the disk structure.
*/
- sc->sc_dk.dk_driver = &rddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
disk_attach(&sc->sc_dk);
}
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 995525a869e..9b05245564b 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnd.c,v 1.100 2010/07/22 14:34:06 thib Exp $ */
+/* $OpenBSD: vnd.c,v 1.101 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */
/*
@@ -153,8 +153,6 @@ struct vnd_softc {
struct vnd_softc *vnd_softc;
int numvnd = 0;
-struct dkdriver vnddkdriver = { vndstrategy };
-
/* called by main() at boot time */
void vndattach(int);
@@ -867,7 +865,6 @@ vndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
vnd->sc_vp, (unsigned long long)vnd->sc_size);
/* Attach the disk. */
- vnd->sc_dk.dk_driver = &vnddkdriver;
vnd->sc_dk.dk_name = vnd->sc_dev.dv_xname;
disk_attach(&vnd->sc_dk);
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 2f599259537..dfdef0f0f1a 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.181 2010/07/28 23:47:43 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.182 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -161,8 +161,6 @@ struct cfdriver cd_cd = {
NULL, "cd", DV_DISK
};
-struct dkdriver cddkdriver = { cdstrategy };
-
const struct scsi_inquiry_pattern cd_patterns[] = {
{T_CDROM, T_REMOV,
"", "", ""},
@@ -217,7 +215,6 @@ cdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize disk structures.
*/
- sc->sc_dk.dk_driver = &cddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
sc->sc_bufq = bufq_init(BUFQ_DEFAULT);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 29db37f9585..6a5f9901651 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.205 2010/08/03 19:37:17 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.206 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -111,8 +111,6 @@ struct cfdriver sd_cd = {
NULL, "sd", DV_DISK
};
-struct dkdriver sddkdriver = { sdstrategy };
-
const struct scsi_inquiry_pattern sd_patterns[] = {
{T_DIRECT, T_FIXED,
"", "", ""},
@@ -173,7 +171,6 @@ sdattach(struct device *parent, struct device *self, void *aux)
/*
* Initialize disk structures.
*/
- sc->sc_dk.dk_driver = &sddkdriver;
sc->sc_dk.dk_name = sc->sc_dev.dv_xname;
sc->sc_bufq = bufq_init(BUFQ_DEFAULT);
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index aac95492946..7dc81cc6d44 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.21 2010/05/03 15:27:28 jsing Exp $ */
+/* $OpenBSD: disk.h,v 1.22 2010/08/28 20:23:22 matthew Exp $ */
/* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */
/*
@@ -100,8 +100,6 @@ struct disk {
int dk_blkshift; /* shift to convert DEV_BSIZE to blks*/
int dk_byteshift; /* shift to convert bytes to blks */
- struct dkdriver *dk_driver; /* pointer to driver */
-
/*
* Disk label information. Storage for the in-core disk label
* must be dynamically allocated, otherwise the size of this
@@ -111,19 +109,6 @@ struct disk {
struct disklabel *dk_label; /* label */
};
-struct dkdriver {
- void (*d_strategy)(struct buf *);
-#ifdef notyet
- int (*d_open)(dev_t dev, int ifmt, int, struct proc *);
- int (*d_close)(dev_t dev, int, int ifmt, struct proc *);
- int (*d_ioctl)(dev_t dev, u_long cmd, caddr_t data, int fflag,
- struct proc *);
- int (*d_dump)(dev_t);
- void (*d_start)(struct buf *, daddr64_t);
- int (*d_mklabel)(struct disk *);
-#endif
-};
-
/* states */
#define DK_CLOSED 0 /* drive is closed */
#define DK_WANTOPEN 1 /* drive being opened */