Unify ichwd(4) attachment messages in dmesg.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2016-03-24 23:24:00 +00:00
parent 3cf50041ef
commit fc6eef7aa8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=297255

View File

@ -540,9 +540,6 @@ ichwd_find_ich_lpc_bridge(struct ichwd_device **id_p)
if (ich == NULL)
return (NULL);
ichwd_verbose_printf(ich, "found ICH%d or equivalent chipset: %s\n",
id->ich_version, id->desc);
if (id_p)
*id_p = id;
@ -573,8 +570,6 @@ ichwd_identify(driver_t *driver, device_t parent)
if (dev == NULL)
return;
device_set_desc_copy(dev, id_p->desc);
switch (id_p->tco_version) {
case 1:
break;
@ -611,10 +606,16 @@ ichwd_identify(driver_t *driver, device_t parent)
static int
ichwd_probe(device_t dev)
{
struct ichwd_device *id_p;
/* Do not claim some ISA PnP device by accident. */
if (isa_get_logicalid(dev) != 0)
return (ENXIO);
if (ichwd_find_ich_lpc_bridge(&id_p) == NULL)
return (ENXIO);
device_set_desc_copy(dev, id_p->desc);
return (0);
}
@ -677,9 +678,6 @@ ichwd_attach(device_t dev)
if (ichwd_clear_noreboot(sc) != 0)
goto fail;
ichwd_verbose_printf(dev, "%s (ICH%d or equivalent)\n",
id_p->desc, sc->ich_version);
/*
* Determine if we are coming up after a watchdog-induced reset. Some
* BIOSes may clear this bit at bootup, preventing us from reporting