diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-12-29 00:45:27 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-12-29 00:45:27 +0000 |
| commit | a4d8ba913b8a80a2ab707584e588b89e2054b5d5 (patch) | |
| tree | fc61f470b7139290f3cde3161b8e8ac0f1857336 /sys | |
| parent | 9fc446b1848450e1ac7cd281ef24c3418acd0d43 (diff) | |
the scsi layer always had function pointers for asking the hba about a
device before issuing scsi commands to it, but it was never implemented,
never used, and no hba actually filled them in. i came along and added
another two function pointers for the same thing.
this cleans up the extra pointers.
ok krw@ marco@ miod@ deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ata/atascsi.c | 8 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index 8baf2511793..fcb10353e2c 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.58 2007/12/28 16:38:23 dlg Exp $ */ +/* $OpenBSD: atascsi.c,v 1.59 2007/12/29 00:45:26 dlg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -57,11 +57,9 @@ void atascsi_free(struct scsi_link *); struct scsi_adapter atascsi_switch = { atascsi_cmd, /* scsi_cmd */ minphys, /* scsi_minphys */ - NULL, - NULL, - atascsi_ioctl, /* ioctl */ atascsi_probe, /* dev_probe */ - atascsi_free /* dev_free */ + atascsi_free, /* dev_free */ + atascsi_ioctl /* ioctl */ }; struct scsi_device atascsi_device = { diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 301ba634de9..88a30e5cea5 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.89 2007/11/26 15:40:51 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.90 2007/12/29 00:45:26 dlg Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -103,12 +103,10 @@ extern int scsi_autoconf; struct scsi_adapter { int (*scsi_cmd)(struct scsi_xfer *); void (*scsi_minphys)(struct buf *); - int (*open_target_lu)(void); - int (*close_target_lu)(void); - int (*ioctl)(struct scsi_link *, u_long, caddr_t, int, - struct proc *); int (*dev_probe)(struct scsi_link *); void (*dev_free)(struct scsi_link *); + int (*ioctl)(struct scsi_link *, u_long, caddr_t, int, + struct proc *); }; /* |