rename the probe and free members of atascsi_methods to ata_probe

and ata_free.

this makes them consistent with the rest of the members, and lets
me #define free to weird debug things in the kernel without screwing
these files up.

diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 4a92769..bd1e83b 100644 (file)
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: atascsi.c,v 1.123 2015/03/14 03:38:47 jsg Exp $ */
+/*     $OpenBSD: atascsi.c,v 1.124 2015/05/15 10:54:26 dlg Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -277,7 +277,7 @@ atascsi_probe(struct scsi_link *link)
                        return (ENXIO);
        }
 
-       type = as->as_methods->probe(as->as_cookie, port, link->lun);
+       type = as->as_methods->ata_probe(as->as_cookie, port, link->lun);
        switch (type) {
        case ATA_PORT_T_DISK:
                break;
@@ -437,7 +437,7 @@ error:
        free(ap, M_DEVBUF, 0);
 unsupported:
 
-       as->as_methods->free(as->as_cookie, port, link->lun);
+       as->as_methods->ata_free(as->as_cookie, port, link->lun);
        return (rv);
 }
 
@@ -464,7 +464,7 @@ atascsi_free(struct scsi_link *link)
        free(ap, M_DEVBUF, 0);
        ahp->ahp_ports[link->lun] = NULL;
 
-       as->as_methods->free(as->as_cookie, port, link->lun);
+       as->as_methods->ata_free(as->as_cookie, port, link->lun);
 
        if (link->lun == ahp->ahp_nports - 1) {
                /* we've already freed all of ahp->ahp_ports, now

diff --git a/sys/dev/ata/atascsi.h b/sys/dev/ata/atascsi.h
index 6348466..ce15b95 100644 (file)
--- a/sys/dev/ata/atascsi.h
+++ b/sys/dev/ata/atascsi.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: atascsi.h,v 1.48 2013/12/09 11:44:52 dlg Exp $ */
+/*     $OpenBSD: atascsi.h,v 1.49 2015/05/15 10:54:26 dlg Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -343,8 +343,8 @@ struct ata_xfer {
  */
 
 struct atascsi_methods {
-       int                     (*probe)(void *, int, int);
-       void                    (*free)(void *, int, int);
+       int                     (*ata_probe)(void *, int, int);
+       void                    (*ata_free)(void *, int, int);
        struct ata_xfer *       (*ata_get_xfer)(void *, int);
        void                    (*ata_put_xfer)(struct ata_xfer *);
        void                    (*ata_cmd)(struct ata_xfer *);