diff options
| author | Scott Long <scottl@FreeBSD.org> | 2004-05-15 05:17:42 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2004-05-15 05:17:42 +0000 |
| commit | bd4c922777d59230aae6c3812520bc84fafab89c (patch) | |
| tree | e4b01b3fd65b1054dd1bbbc15016a1f2e598505f /sys/dev/twa | |
| parent | 7a08579a08691f0b622de516c923e8fbb348dff2 (diff) | |
Remove the config_intrhook as it is not needed.
Notes
svn path=/head/; revision=129261
Diffstat (limited to 'sys/dev/twa')
| -rw-r--r-- | sys/dev/twa/twa.h | 1 | ||||
| -rw-r--r-- | sys/dev/twa/twa_freebsd.c | 39 |
2 files changed, 1 insertions, 39 deletions
diff --git a/sys/dev/twa/twa.h b/sys/dev/twa/twa.h index 5f49b496c0c5..0fee37ecdb9f 100644 --- a/sys/dev/twa/twa.h +++ b/sys/dev/twa/twa.h @@ -183,7 +183,6 @@ struct twa_softc { bus_addr_t twa_cmd_pkt_phys;/* phys addr of first of array of cmd pkts */ struct resource *twa_irq_res; /* interrupt resource*/ void *twa_intr_handle;/* interrupt handle */ - struct intr_config_hook twa_ich; /* delayed-startup hook */ struct sysctl_ctx_list twa_sysctl_ctx; struct sysctl_oid *twa_sysctl_tree; diff --git a/sys/dev/twa/twa_freebsd.c b/sys/dev/twa/twa_freebsd.c index 9879448f9441..ed8c35502e17 100644 --- a/sys/dev/twa/twa_freebsd.c +++ b/sys/dev/twa/twa_freebsd.c @@ -292,20 +292,7 @@ twa_attach(device_t dev) UID_ROOT, GID_OPERATOR, S_IRUSR | S_IWUSR, "twa%d", device_get_unit(sc->twa_bus_dev)); sc->twa_ctrl_dev->si_drv1 = sc; - - /* - * Schedule ourselves to bring the controller up once interrupts are - * available. This isn't strictly necessary, since we disable - * interrupts while probing the controller, but it is more in keeping - * with common practice for other disk devices. - */ - sc->twa_ich.ich_func = twa_intrhook; - sc->twa_ich.ich_arg = sc; - if (config_intrhook_establish(&sc->twa_ich) != 0) { - twa_printf(sc, "Can't establish configuration hook.\n"); - twa_free(sc); - return(ENXIO); - } + twa_enable_interrupts(sc); if ((error = twa_cam_setup(sc))) { twa_free(sc); @@ -517,30 +504,6 @@ twa_pci_intr(void *arg) /* - * Function name: twa_intrhook - * Description: Callback for us to enable interrupts. - * - * Input: arg -- ptr to per ctlr structure - * Output: None - * Return value: None - */ -static void -twa_intrhook(void *arg) -{ - struct twa_softc *sc = (struct twa_softc *)arg; - - twa_dbg_dprint(4, sc, "twa_intrhook Entered"); - - /* Pull ourselves off the intrhook chain. */ - config_intrhook_disestablish(&sc->twa_ich); - - /* Enable interrupts. */ - twa_enable_interrupts(sc); -} - - - -/* * Function name: twa_write_pci_config * Description: Writes to the PCI config space. * |