From f8ef0d9b7276dbb53a6d2c76693bd3950cabec64 Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 13 Jul 2009 06:12:21 +0000 Subject: Rename ATA probe driver to "aprobe" to resolve name conflict with SCSI and fix loading cam as module. Approved by: re (implicitly) --- sys/cam/ata/ata_xpt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 7f8daa2..8d30297 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -83,11 +83,11 @@ static periph_init_t probe_periph_init; static struct periph_driver probe_driver = { - probe_periph_init, "probe", + probe_periph_init, "aprobe", TAILQ_HEAD_INITIALIZER(probe_driver.units) }; -PERIPHDRIVER_DECLARE(probe, probe_driver); +PERIPHDRIVER_DECLARE(aprobe, probe_driver); typedef enum { PROBE_RESET, @@ -1311,7 +1311,7 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path, request_ccb->crcn.flags = flags; } - if ((old_periph = cam_periph_find(path, "probe")) != NULL) { + if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) { probe_softc *softc; softc = (probe_softc *)old_periph->softc; @@ -1319,7 +1319,7 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path, periph_links.tqe); } else { status = cam_periph_alloc(proberegister, NULL, probecleanup, - probestart, "probe", + probestart, "aprobe", CAM_PERIPH_BIO, request_ccb->ccb_h.path, NULL, 0, request_ccb); -- cgit v1.1