39c39
< __FBSDID("$FreeBSD: head/sys/dev/ichsmb/ichsmb.c 162234 2006-09-11 20:52:41Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ichsmb/ichsmb.c 165951 2007-01-11 19:56:24Z jhb $");
74c74
< do { log(LOG_DEBUG, "%s: " fmt, __func__ , ## args); } while (0)
---
> do { printf("%s: " fmt, __func__ , ## args); } while (0)
112a113,115
> /* Create mutex */
> mtx_init(&sc->mutex, device_get_nameunit(dev), "ichsmb", MTX_DEF);
>
115,117c118,120
< log(LOG_ERR, "%s: no \"%s\" child found\n",
< device_get_nameunit(dev), DRIVER_SMBUS);
< return (ENXIO);
---
> device_printf(dev, "no \"%s\" child found\n", DRIVER_SMBUS);
> error = ENXIO;
> goto fail;
123c126,134
< /* Add "smbus" child */
---
> /* Set up interrupt handler */
> error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC,
> ichsmb_device_intr, sc, &sc->irq_handle);
> if (error != 0) {
> device_printf(dev, "can't setup irq\n");
> goto fail;
> }
>
> /* Attach "smbus" child */
125,127c136,137
< log(LOG_ERR, "%s: failed to attach child: %d\n",
< device_get_nameunit(dev), error);
< return (ENXIO);
---
> device_printf(dev, "failed to attach child: %d\n", error);
> goto fail;
130,131d139
< /* Create mutex */
< mtx_init(&sc->mutex, device_get_nameunit(dev), "ichsmb", MTX_DEF);
132a141,144
>
> fail:
> mtx_destroy(&sc->mutex);
> return (error);
521,522c533,534
< log(LOG_ERR, "%s: irq 0x%02x during %d\n",
< device_get_nameunit(dev), status, cmd_index);
---
> device_printf(dev, "irq 0x%02x during %d\n", status,
> cmd_index);
532,533c544
< log(LOG_WARNING, "%s: SMBALERT# rec'd\n",
< device_get_nameunit(dev));
---
> device_printf(dev, "SMBALERT# rec'd\n");
535,537c546,547
< log(LOG_WARNING,
< "%s: not logging anymore\n",
< device_get_nameunit(dev));
---
> device_printf(dev,
> "not logging anymore\n");
612,613c622
< log(LOG_ERR, "%s: interrupt loop, status=0x%02x\n",
< device_get_nameunit(dev),
---
> device_printf(dev, "interrupt loop, status=0x%02x\n",
638,639c647
< log(LOG_ERR, "%s: device timeout, status=0x%02x\n",
< device_get_nameunit(dev),
---
> device_printf(dev, "device timeout, status=0x%02x\n",