aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorSøren Schmidt <sos@FreeBSD.org>2005-04-20 12:51:54 +0000
committerSøren Schmidt <sos@FreeBSD.org>2005-04-20 12:51:54 +0000
commit77662bd70592c4e9fbbaafff0b7bae4f226e25dd (patch)
treeb907e59bf99e3fc938450fb25a194310eb850ef4 /sys/dev
parent10687779a9508388dff63f93f0d958df566b8a96 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata-all.c3
-rw-r--r--sys/dev/ata/ata-all.h1
-rw-r--r--sys/dev/ata/ata-chipset.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index e3b27bfc70fb8..c70e01fcb3c69 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -69,7 +69,6 @@ static struct cdevsw ata_cdevsw = {
static void ata_interrupt(void *);
static void ata_boot_attach(void);
device_t ata_add_child(device_t parent, struct ata_device *atadev, int unit);
-static int ata_identify(device_t dev);
/* global vars */
MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer");
@@ -597,7 +596,7 @@ ata_add_child(device_t parent, struct ata_device *atadev, int unit)
return child;
}
-static int
+int
ata_identify(device_t dev)
{
struct ata_channel *ch = device_get_softc(dev);
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 32bf26d5262fd..10b18d6bcbf41 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -453,6 +453,7 @@ int ata_detach(device_t dev);
int ata_reinit(device_t dev);
int ata_suspend(device_t dev);
int ata_resume(device_t dev);
+int ata_identify(device_t dev);
void ata_default_registers(struct ata_channel *ch);
void ata_udelay(int interval);
char *ata_mode2str(int mode);
diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index 2ea1a6ba2c1a4..f9414fd4e86ee 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -294,8 +294,7 @@ ata_sata_phy_event(void *context, int dummy)
device_printf(tp->dev, "CONNECTED\n");
ata_sata_connect(ch);
- bus_generic_probe(tp->dev);
- bus_generic_attach(tp->dev);
+ ata_identify(tp->dev);
}
if (tp->action == ATA_C_DETACH) {
if (!device_get_children(tp->dev, &children, &nchildren)) {