Move sc_ih to virtio_pci_softc, it is not used outside of virtio_pci

and is really a transport-specific thing.

OK jasper@

2 files changed, 9 insertions, 7 deletions

diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c
index d10e8a01b06..ecd01f2f32c 100644
--- a/sys/dev/pci/virtio_pci.c
+++ b/sys/dev/pci/virtio_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio_pci.c,v 1.4 2012/12/05 23:20:21 deraadt Exp $	*/
+/*	$OpenBSD: virtio_pci.c,v 1.5 2013/03/10 21:56:11 sf Exp $	*/
 /*	$NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $	*/
 
 /*
@@ -76,6 +76,9 @@ struct virtio_pci_softc {
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	bus_size_t		sc_iosize;
+
+	void                    *sc_ih;
+
 	int			sc_config_offset;
 };
 
@@ -213,8 +216,8 @@ virtio_pci_attach(struct device *parent, struct device *self, void *aux)
 		goto fail_2;
 	}
 	intrstr = pci_intr_string(pc, ih);
-	vsc->sc_ih = pci_intr_establish(pc, ih, vsc->sc_ipl, virtio_pci_intr, sc, vsc->sc_dev.dv_xname);
-	if (vsc->sc_ih == NULL) {
+	sc->sc_ih = pci_intr_establish(pc, ih, vsc->sc_ipl, virtio_pci_intr, sc, vsc->sc_dev.dv_xname);
+	if (sc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt", vsc->sc_dev.dv_xname);
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
@@ -247,8 +250,8 @@ virtio_pci_detach(struct device *self, int flags)
 	}
 	KASSERT(vsc->sc_child == 0 || vsc->sc_child == VIRTIO_CHILD_ERROR);
 	KASSERT(vsc->sc_vqs == 0);
-	pci_intr_disestablish(sc->sc_pc, vsc->sc_ih);
-	vsc->sc_ih = 0;
+	pci_intr_disestablish(sc->sc_pc, sc->sc_ih);
+	sc->sc_ih = 0;
 	if (sc->sc_iosize)
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize);
 	sc->sc_iosize = 0;
diff --git a/sys/dev/pci/virtiovar.h b/sys/dev/pci/virtiovar.h
index 749eea87cf7..9a68dd72db7 100644
--- a/sys/dev/pci/virtiovar.h
+++ b/sys/dev/pci/virtiovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtiovar.h,v 1.2 2012/10/12 21:12:19 reyk Exp $	*/
+/*	$OpenBSD: virtiovar.h,v 1.3 2013/03/10 21:56:11 sf Exp $	*/
 /*	$NetBSD: virtiovar.h,v 1.1 2011/10/30 12:12:21 hannken Exp $	*/
 
 /*
@@ -160,7 +160,6 @@ struct virtio_softc {
 	struct virtio_ops	*sc_ops;	/* set by transport */
 
 	int			 sc_ipl;		/* set by child */
-	void			*sc_ih;		/* set by transport */
 
 	uint32_t		 sc_features;
 	int			 sc_indirect;