From owner-dev-commits-src-all@freebsd.org Wed Sep 29 20:27:48 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD6F167B41B; Wed, 29 Sep 2021 20:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HKSc43WJ8z4qDg; Wed, 29 Sep 2021 20:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2BF141EC0F; Wed, 29 Sep 2021 20:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18TKRmtk038850; Wed, 29 Sep 2021 20:27:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18TKRmNY038849; Wed, 29 Sep 2021 20:27:48 GMT (envelope-from git) Date: Wed, 29 Sep 2021 20:27:48 GMT Message-Id: <202109292027.18TKRmNY038849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5ca1f3f5e3a3 - main - LinuxKPI: Hide some internal symbols in linux_interrupt.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ca1f3f5e3a322ddb598295825bdc1d831ba71d5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2021 20:27:49 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5ca1f3f5e3a322ddb598295825bdc1d831ba71d5 commit 5ca1f3f5e3a322ddb598295825bdc1d831ba71d5 Author: Vladimir Kondratyev AuthorDate: 2021-09-29 20:26:14 +0000 Commit: Vladimir Kondratyev 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