Date: Thu, 8 Mar 2007 17:34:07 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 115537 for review Message-ID: <200703081734.l28HY7F6008829@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=115537 Change 115537 by piso@piso_newluxor on 2007/03/08 17:33:32 As the stray code went moot, axe ie_pending() cause its not used anymore. Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#26 edit .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#22 edit .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#33 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#24 edit .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#36 edit .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#30 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#24 edit .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#9 edit .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#18 edit Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#26 (text+ko) ==== @@ -140,8 +140,7 @@ if (interrupt_sources[vector] != NULL) return (EEXIST); error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, - (int (*)(void *))isrc->is_pic->pic_source_pending, + (mask_fn)isrc->is_pic->pic_enable_source, intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); if (error) return (error); ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#22 (text+ko) ==== @@ -75,7 +75,7 @@ event = intr_events[irq]; if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, - (void (*)(void *))arm_unmask_irq, NULL, NULL, + (void (*)(void *))arm_unmask_irq, NULL, intr_disab_eoi_src, "intr%d:", irq); if (error) return; ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#33 (text+ko) ==== @@ -131,8 +131,7 @@ if (interrupt_sources[vector] != NULL) return (EEXIST); error = intr_event_create(&isrc->is_event, isrc, 0, - (mask_fn)isrc->is_pic->pic_enable_source, - (int (*)(void *))isrc->is_pic->pic_source_pending, + (mask_fn)isrc->is_pic->pic_enable_source, intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); if (error) return (error); ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#24 (text+ko) ==== @@ -323,7 +323,7 @@ bcopy(name, intrname, strlen(name)); } errcode = intr_event_create(&i->event, (void *)vector, 0, - (void (*)(void *))ia64_send_eoi, NULL, intr_eoi_src, + (void (*)(void *))ia64_send_eoi, intr_eoi_src, NULL, "intr:"); if (errcode) { free(i, M_DEVBUF); ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#36 (text+ko) ==== @@ -235,8 +235,8 @@ int intr_event_create(struct intr_event **event, void *source, int flags, - void (*enable)(void *), int (*pending)(void *), void (*eoi)(void *), - void (*disab)(void *), const char *fmt, ...) + void (*enable)(void *), void (*eoi)(void *), void (*disab)(void *), + const char *fmt, ...) { struct intr_event *ie; va_list ap; @@ -247,7 +247,6 @@ ie = malloc(sizeof(struct intr_event), M_ITHREAD, M_WAITOK | M_ZERO); ie->ie_source = source; ie->ie_enable = enable; - ie->ie_pending = pending; ie->ie_eoi = eoi; ie->ie_disab = disab; ie->ie_flags = flags; @@ -608,7 +607,7 @@ if (!(ie->ie_flags & IE_SOFT)) return (EINVAL); } else { - error = intr_event_create(&ie, NULL, IE_SOFT, NULL, + error = intr_event_create(&ie, NULL, IE_SOFT, NULL, NULL, NULL, "swi%d:", pri); if (error) return (error); ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#30 (text+ko) ==== @@ -154,7 +154,7 @@ if (i == NULL) return (ENOMEM); error = intr_event_create(&i->event, (void *)irq, 0, - (void (*)(void *))irq_enable, NULL, intr_eoi_src, + (void (*)(void *))irq_enable, intr_eoi_src, NULL, "irq%d:", irq); if (error) { free(i, M_INTR); ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#24 (text+ko) ==== @@ -262,9 +262,8 @@ ie = iv->iv_event; mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { - errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, NULL, - NULL, NULL, NULL, "vec%d:", - vec); + errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, + NULL, NULL, NULL, "vec%d:", vec); if (errcode) return (errcode); mtx_lock_spin(&intr_table_lock); ==== //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#9 (text+ko) ==== @@ -355,7 +355,7 @@ mtx_unlock_spin(&intr_table_lock); if (ie == NULL) { errcode = intr_event_create(&ie, (void *)(intptr_t)vec, 0, - NULL, NULL, NULL, NULL, "vec%d:", + NULL, NULL, NULL, "vec%d:", vec); if (errcode) return (errcode); ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#18 (text+ko) ==== @@ -73,7 +73,6 @@ void *ie_source; /* Cookie used by MD code. */ struct intr_thread *ie_thread; /* Thread we are connected to. */ void (*ie_enable)(void *); - int (*ie_pending)(void *); void (*ie_eoi)(void *); void (*ie_disab)(void *); int ie_flags; @@ -125,9 +124,9 @@ driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri, enum intr_type flags, void **cookiep); int intr_event_create(struct intr_event **event, void *source, - int flags, void (*enable)(void *), int (*pending)(void *), - void (*eoi)(void *), void (*disab)(void *), const char *fmt, ...) - __printflike(8, 9); + int flags, void (*enable)(void *), void (*eoi)(void *), + void (*disab)(void *), const char *fmt, ...) + __printflike(7, 8); int intr_event_destroy(struct intr_event *ie); int intr_event_remove_handler(void *cookie); int intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *ithd);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703081734.l28HY7F6008829>