The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5ca1f3f5e3a322ddb598295825bdc1d831ba71d5
commit 5ca1f3f5e3a322ddb598295825bdc1d831ba71d5 Author: Vladimir Kondratyev <[email protected]> AuthorDate: 2021-09-29 20:26:14 +0000 Commit: Vladimir Kondratyev <[email protected]> CommitDate: 2021-09-29 20:26:14 +0000 LinuxKPI: Hide some internal symbols in linux_interrupt.c Reviewed by: hselasky, manu Differential revision: https://reviews.freebsd.org/D32168 --- sys/compat/linuxkpi/common/include/linux/interrupt.h | 5 ----- sys/compat/linuxkpi/common/src/linux_interrupt.c | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h index 4e6c859853a7..964b95edb43f 100644 --- a/sys/compat/linuxkpi/common/include/linux/interrupt.h +++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h @@ -44,11 +44,6 @@ typedef irqreturn_t (*irq_handler_t)(int, void *); #define IRQF_SHARED RF_SHAREABLE -struct irq_ent; - -void linux_irq_handler(void *); -void lkpi_devm_irq_release(struct device *, void *); -void lkpi_irq_release(struct device *, struct irq_ent *); int lkpi_request_irq(struct device *, unsigned int, irq_handler_t, irq_handler_t, unsigned long, const char *, void *); int lkpi_enable_irq(unsigned int); diff --git a/sys/compat/linuxkpi/common/src/linux_interrupt.c b/sys/compat/linuxkpi/common/src/linux_interrupt.c index cc6380553497..f96a47137fab 100644 --- a/sys/compat/linuxkpi/common/src/linux_interrupt.c +++ b/sys/compat/linuxkpi/common/src/linux_interrupt.c @@ -71,8 +71,8 @@ lkpi_irq_ent(struct device *dev, unsigned int irq) return (NULL); } -void -linux_irq_handler(void *ent) +static void +lkpi_irq_handler(void *ent) { struct irq_ent *irqe; @@ -88,7 +88,7 @@ linux_irq_handler(void *ent) } } -void +static inline void lkpi_irq_release(struct device *dev, struct irq_ent *irqe) { if (irqe->tag != NULL) @@ -99,7 +99,7 @@ lkpi_irq_release(struct device *dev, struct irq_ent *irqe) list_del(&irqe->links); } -void +static void lkpi_devm_irq_release(struct device *dev, void *p) { struct irq_ent *irqe; @@ -145,7 +145,7 @@ lkpi_request_irq(struct device *xdev, unsigned int irq, irqe->irq = irq; error = bus_setup_intr(dev->bsddev, res, INTR_TYPE_NET | INTR_MPSAFE, - NULL, linux_irq_handler, irqe, &irqe->tag); + NULL, lkpi_irq_handler, irqe, &irqe->tag); if (error) goto errout; list_add(&irqe->links, &dev->irqents); @@ -176,7 +176,7 @@ lkpi_enable_irq(unsigned int irq) if (irqe == NULL || irqe->tag != NULL) return -EINVAL; return -bus_setup_intr(dev->bsddev, irqe->res, INTR_TYPE_NET | INTR_MPSAFE, - NULL, linux_irq_handler, irqe, &irqe->tag); + NULL, lkpi_irq_handler, irqe, &irqe->tag); } void _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
