diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-08 19:46:11 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-08 19:46:11 +0000 |
| commit | ccf47d1672cad6888d700a022f431f1ee8d54a95 (patch) | |
| tree | 01d3abc033dc5b163bdce5aca3909c0e467c0dd4 /sys/dev/ic/sili.c | |
| parent | ddd48b5f2421f22f246e7121fe87c61b69fc3582 (diff) | |
Move ata_put_xfer() from ata_xfer to atascsi_methods. It's just silly
to have a non-changing function pointer be part of an object rather
than it's virtual method table.
ok dlg@; tested on ahci(4) by Mattieu Baptiste, jasper@, and Jason
Crawford; no sili(4) testers, but identical changes to ahci(4)
Diffstat (limited to 'sys/dev/ic/sili.c')
| -rw-r--r-- | sys/dev/ic/sili.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c index c045c7c7280..5da88de6a1f 100644 --- a/sys/dev/ic/sili.c +++ b/sys/dev/ic/sili.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sili.c,v 1.47 2011/01/26 21:41:00 drahn Exp $ */ +/* $OpenBSD: sili.c,v 1.48 2011/05/08 19:46:10 matthew Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -211,6 +211,7 @@ struct atascsi_methods sili_atascsi_methods = { sili_ata_probe, sili_ata_free, sili_ata_get_xfer, + sili_ata_put_xfer, sili_ata_cmd }; @@ -833,7 +834,6 @@ sili_ccb_alloc(struct sili_port *sp) ccb->ccb_xa.fis = (struct ata_fis_h2d *)&prb->fis; ccb->ccb_xa.packetcmd = ((struct sili_prb_packet *)prb)->cdb; ccb->ccb_xa.tag = i; - ccb->ccb_xa.ata_put_xfer = sili_ata_put_xfer; ccb->ccb_xa.state = ATA_S_COMPLETE; sili_put_ccb(ccb); |