Fix earlier commit of pciide disestablish

5 files changed, 16 insertions, 24 deletions

diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 6376aa35bfe..eee5dfc0807 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.3 2001/06/25 21:49:41 csapuntz Exp $ */
+/* $OpenBSD: pci_550.c,v 1.4 2001/06/25 22:02:07 csapuntz Exp $ */
 /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
@@ -105,8 +105,7 @@ void	dec_550_intr_disestablish __P((void *, void *));
 
 void	*dec_550_pciide_compat_intr_establish __P((void *, struct device *,
 	    struct pci_attach_args *, int, int (*)(void *), void *));
-void    dec_550_pciide_compat_intr_disestablish __P((void *, pci_chipset_tag_t,
-	    void *));
+void    dec_550_pciide_compat_intr_disestablish __P((void *, void *));
 
 #define	DEC_550_PCI_IRQ_BEGIN	8
 #define	DEC_550_MAX_IRQ		(64 - DEC_550_PCI_IRQ_BEGIN)
@@ -409,9 +408,8 @@ dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 }
 
 void
-dec_550_pciide_compat_intr_disestablish(v, pc, cookie)
+dec_550_pciide_compat_intr_disestablish(v, cookie)
 	void *v;
-	pci_chipset_tag_t pc;
 	void *cookie;
 {
 	sio_intr_disestablish(NULL, cookie);
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 96e208f746c..f875d9da4a9 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.3 2001/06/25 21:49:42 csapuntz Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.4 2001/06/25 22:02:08 csapuntz Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -85,8 +85,7 @@ const struct evcnt *dec_6600_intr_evcnt __P((void *, pci_intr_handle_t));
 int dec_6600_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *));
 void *dec_6600_pciide_compat_intr_establish __P((void *, struct device *,
     struct pci_attach_args *, int, int (*)(void *), void *));
-void  dec_6600_pciide_compat_intr_disestablish __P((void *, pci_chipset_tag_t,
-	    void *));
+void  dec_6600_pciide_compat_intr_disestablish __P((void *, void *));
 
 struct alpha_shared_intr *dec_6600_pci_intr;
 
@@ -373,9 +372,8 @@ dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 }
 
 void
-dec_6600_pciide_compat_intr_disestablish(v, pc, cookie)
+dec_6600_pciide_compat_intr_disestablish(v, cookie)
 	void *v;
-	pci_chipset_tag_t pc;
 	void *cookie;
 {
 	sio_intr_disestablish(NULL, cookie);
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 09771e8e562..8cfd57180a0 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.7 2001/06/25 21:49:42 csapuntz Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.8 2001/06/25 22:02:08 csapuntz Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -105,8 +105,7 @@ void	dec_eb164_intr_disestablish __P((void *, void *));
 
 void	*dec_eb164_pciide_compat_intr_establish __P((void *, struct device *,
 	    struct pci_attach_args *, int, int (*)(void *), void *));
-void    dec_eb164_pciide_compat_intr_disestablish __P((void *,
-	    pci_chipset_tag_t, void *));
+void    dec_eb164_pciide_compat_intr_disestablish __P((void *, void *));
 
 #define	EB164_SIO_IRQ	4  
 #define	EB164_MAX_IRQ	24
@@ -337,8 +336,7 @@ dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 }
 
 void
-dec_eb164_pciide_compat_intr_disestablish(void *v, pci_chipset_tag_t pc,
-    void *cookie)
+dec_eb164_pciide_compat_intr_disestablish(void *v, void *cookie)
 {
 	sio_intr_disestablish(NULL, cookie);
 }
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index 0297018ecb3..b8879eee302 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.10 2001/06/25 21:49:43 csapuntz Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.11 2001/06/25 22:02:08 csapuntz Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ struct alpha_pci_chipset {
                             struct device *, struct pci_attach_args *, int,
                             int (*)(void *), void *));
 	void            (*pc_pciide_compat_intr_disestablish) __P((void *,
-			    pci_chipset_tag_t pc, void *));
+			    void *));
 };
 
 /*
@@ -112,8 +112,8 @@ void	pci_display_console __P((bus_space_tag_t, bus_space_tag_t,
      (*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p),  \
         (ch), (f), (a)))
 
-#define alpha_pciide_compat_intr_disestablish(c, p, cookie)             \
-    do { ((c)->pc_pciide_compat_intr_disestablish)((c)->pc_conf_v, (p), \
+#define alpha_pciide_compat_intr_disestablish(c, cookie)                \
+    do { ((c)->pc_pciide_compat_intr_disestablish)((c)->pc_conf_v,      \
             (cookie)); } while (0)
 
 #ifdef _KERNEL
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index a6869faef06..6a1701d6d16 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_up1000.c,v 1.3 2001/06/25 21:49:43 csapuntz Exp $	*/
+/*	$OpenBSD: pci_up1000.c,v 1.4 2001/06/25 22:02:08 csapuntz Exp $	*/
 /* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
 
 /*-
@@ -75,8 +75,7 @@ void    api_up1000_intr_disestablish(void *, void *);
 
 void	*api_up1000_pciide_compat_intr_establish(void *, struct device *,
 	    struct pci_attach_args *, int, int (*)(void *), void *);
-void    api_up1000_pciide_compat_intr_disestablish(void *, pci_chipset_tag_t,
-            void *);
+void    api_up1000_pciide_compat_intr_disestablish(void *, void *);
 
 void
 pci_up1000_pickintr(struct irongate_config *icp)
@@ -221,8 +220,7 @@ api_up1000_pciide_compat_intr_establish(void *icv, struct device *dev,
 }
 
 void
-api_up1000_pciide_compat_intr_disestablish(void *v, pci_chipset_tag_t pc,
-    void *cookie)
+api_up1000_pciide_compat_intr_disestablish(void *v, void *cookie)
 {
 	sio_intr_disestablish(NULL, cookie);
 }