From d140959731da97a028538b63ff0bdacff86738bd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 26 Sep 2003 00:00:19 -0700 Subject: [PATCH] [PATCH] ia64: simplify SN2 interrupt allocation Same issues as the dma mapping code, but as SN2 interrupt handling is totally static and all irqs are allocated on bootup an never freed it's not a speed issue. I really wonder what someone has to smoke to call a that expensive dispatcher just to cast the data structure back to the lowlevel one directly afterwards... --- arch/ia64/sn/io/machvec/pci_bus_cvlink.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c index cafe8faefa976..e07fc54ead921 100644 --- a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c +++ b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c @@ -426,7 +426,7 @@ sn_pci_fixup(int arg) struct pci_dev *device_dev = NULL; struct sn_widget_sysdata *widget_sysdata; struct sn_device_sysdata *device_sysdata; - pciio_intr_t intr_handle; + pcibr_intr_t intr_handle; int cpuid; vertex_hdl_t device_vertex; pciio_intr_line_t lines; @@ -549,17 +549,17 @@ sn_pci_fixup(int arg) (unsigned char *)&lines); irqpdaindr->curr = device_dev; - intr_handle = pciio_intr_alloc(device_vertex, NULL, lines, device_vertex); + intr_handle = pcibr_intr_alloc(device_vertex, NULL, lines, device_vertex); - irq = intr_handle->pi_irq; + irq = intr_handle->bi_irq; irqpdaindr->device_dev[irq] = device_dev; - cpuid = intr_handle->pi_cpu; - pciio_intr_connect(intr_handle, (intr_func_t)0, (intr_arg_t)0); + cpuid = intr_handle->bi_cpu; + pcibr_intr_connect(intr_handle, (intr_func_t)0, (intr_arg_t)0); device_dev->irq = irq; - register_pcibr_intr(irq, (pcibr_intr_t)intr_handle); + register_pcibr_intr(irq, intr_handle); for (idx = 0; idx < PCI_ROM_RESOURCE; idx++) { - int ibits = ((pcibr_intr_t)intr_handle)->bi_ibits; + int ibits = intr_handle->bi_ibits; int i; size = device_dev->resource[idx].end - -- 2.53.0