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/pci | |
| 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/pci')
| -rw-r--r-- | sys/dev/pci/ahci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c index add35948bde..ac23e5a5d5b 100644 --- a/sys/dev/pci/ahci.c +++ b/sys/dev/pci/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.177 2011/04/24 11:09:48 dlg Exp $ */ +/* $OpenBSD: ahci.c,v 1.178 2011/05/08 19:46:10 matthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -622,6 +622,7 @@ struct atascsi_methods ahci_atascsi_methods = { ahci_ata_probe, ahci_ata_free, ahci_ata_get_xfer, + ahci_ata_put_xfer, ahci_ata_cmd }; @@ -1228,8 +1229,6 @@ nomem: ccb->ccb_xa.packetcmd = ccb->ccb_cmd_table->acmd; ccb->ccb_xa.tag = i; - ccb->ccb_xa.ata_put_xfer = ahci_ata_put_xfer; - ccb->ccb_xa.state = ATA_S_COMPLETE; ahci_put_ccb(ccb); } |