diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-25 23:03:05 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-25 23:03:05 +0000 |
| commit | f55ef036c92caa4df42d57eab4a0fee70673fcaa (patch) | |
| tree | ec8e0133aafb99d43934e2427f3263d9c91584b2 /sys/arch/alpha/pci | |
| parent | a4e66bda4678bdd81d7eaad25a9d1fc0d6416692 (diff) | |
Be more careful in pciide_compat_intr_disestablish.
While I'm here, clean up spaces.
Diffstat (limited to 'sys/arch/alpha/pci')
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h index b8879eee302..a78c5af74d2 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.11 2001/06/25 22:02:08 csapuntz Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.12 2001/06/25 23:03:04 art Exp $ */ /* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */ /* @@ -105,15 +105,16 @@ struct alpha_pci_chipset { */ void pci_display_console __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int)); -#define alpha_pci_decompose_tag(c, t, bp, dp, fp) \ +#define alpha_pci_decompose_tag(c, t, bp, dp, fp) \ (*(c)->pc_decompose_tag)((c)->pc_conf_v, (t), (bp), (dp), (fp)) -#define alpha_pciide_compat_intr_establish(c, d, p, ch, f, a) \ - ((c)->pc_pciide_compat_intr_establish == NULL ? NULL : \ - (*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p), \ +#define alpha_pciide_compat_intr_establish(c, d, p, ch, f, a) \ + ((c)->pc_pciide_compat_intr_establish == NULL ? NULL : \ + (*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p), \ (ch), (f), (a))) -#define alpha_pciide_compat_intr_disestablish(c, cookie) \ - do { ((c)->pc_pciide_compat_intr_disestablish)((c)->pc_conf_v, \ +#define alpha_pciide_compat_intr_disestablish(c, cookie) \ + do { if ((c)->pc_pciide_compat_intr_disestablish != NULL) \ + ((c)->pc_pciide_compat_intr_disestablish)((c)->pc_conf_v, \ (cookie)); } while (0) #ifdef _KERNEL |