From: Jan Kiszka <jan.kiszka@siemens.com> To: Bjorn Helgaas <bhelgaas@google.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/10] PCI: Add dev parameter to __of_pci_get_host_bridge_resources() Date: Mon, 30 Apr 2018 07:48:38 +0200 [thread overview] Message-ID: <cfab525f3d0436f75187fbd65907ada909d7692f.1525067324.git.jan.kiszka@siemens.com> (raw) In-Reply-To: <cover.1525067324.git.jan.kiszka@siemens.com> In-Reply-To: <cover.1525067324.git.jan.kiszka@siemens.com> From: Jan Kiszka <jan.kiszka@siemens.com> When non-NULL, use the new dev parameter of __of_pci_get_host_bridge_resources() to allocate the resource data structures via devm_kzalloc. That allows to release them automatically during device destruction. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- drivers/pci/of.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 375de447a58e..bfa282b538d5 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -243,7 +243,7 @@ void of_pci_check_probe_only(void) EXPORT_SYMBOL_GPL(of_pci_check_probe_only); #if defined(CONFIG_OF_ADDRESS) -static int __of_pci_get_host_bridge_resources( +static int __of_pci_get_host_bridge_resources(struct device *dev, struct device_node *dev_node, unsigned char busno, unsigned char bus_max, struct list_head *resources, resource_size_t *io_base) @@ -259,7 +259,10 @@ static int __of_pci_get_host_bridge_resources( if (io_base) *io_base = (resource_size_t)OF_BAD_ADDR; - bus_range = kzalloc(sizeof(*bus_range), GFP_KERNEL); + if (dev) + bus_range = devm_kzalloc(dev,sizeof(*bus_range), GFP_KERNEL); + else + bus_range = kzalloc(sizeof(*bus_range), GFP_KERNEL); if (!bus_range) return -ENOMEM; @@ -303,7 +306,11 @@ static int __of_pci_get_host_bridge_resources( if (range.cpu_addr == OF_BAD_ADDR || range.size == 0) continue; - res = kzalloc(sizeof(struct resource), GFP_KERNEL); + if (dev) + res = devm_kzalloc(dev, sizeof(struct resource), + GFP_KERNEL); + else + res = kzalloc(sizeof(struct resource), GFP_KERNEL); if (!res) { err = -ENOMEM; goto parse_failed; @@ -365,7 +372,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev_node, unsigned char busno, unsigned char bus_max, struct list_head *resources, resource_size_t *io_base) { - return __of_pci_get_host_bridge_resources(dev_node, busno, + return __of_pci_get_host_bridge_resources(NULL, dev_node, busno, bus_max, resources, io_base); } EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); -- 2.13.6
WARNING: multiple messages have this Message-ID (diff)
From: jan.kiszka@siemens.com (Jan Kiszka) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/10] PCI: Add dev parameter to __of_pci_get_host_bridge_resources() Date: Mon, 30 Apr 2018 07:48:38 +0200 [thread overview] Message-ID: <cfab525f3d0436f75187fbd65907ada909d7692f.1525067324.git.jan.kiszka@siemens.com> (raw) In-Reply-To: <cover.1525067324.git.jan.kiszka@siemens.com> From: Jan Kiszka <jan.kiszka@siemens.com> When non-NULL, use the new dev parameter of __of_pci_get_host_bridge_resources() to allocate the resource data structures via devm_kzalloc. That allows to release them automatically during device destruction. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- drivers/pci/of.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 375de447a58e..bfa282b538d5 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -243,7 +243,7 @@ void of_pci_check_probe_only(void) EXPORT_SYMBOL_GPL(of_pci_check_probe_only); #if defined(CONFIG_OF_ADDRESS) -static int __of_pci_get_host_bridge_resources( +static int __of_pci_get_host_bridge_resources(struct device *dev, struct device_node *dev_node, unsigned char busno, unsigned char bus_max, struct list_head *resources, resource_size_t *io_base) @@ -259,7 +259,10 @@ static int __of_pci_get_host_bridge_resources( if (io_base) *io_base = (resource_size_t)OF_BAD_ADDR; - bus_range = kzalloc(sizeof(*bus_range), GFP_KERNEL); + if (dev) + bus_range = devm_kzalloc(dev,sizeof(*bus_range), GFP_KERNEL); + else + bus_range = kzalloc(sizeof(*bus_range), GFP_KERNEL); if (!bus_range) return -ENOMEM; @@ -303,7 +306,11 @@ static int __of_pci_get_host_bridge_resources( if (range.cpu_addr == OF_BAD_ADDR || range.size == 0) continue; - res = kzalloc(sizeof(struct resource), GFP_KERNEL); + if (dev) + res = devm_kzalloc(dev, sizeof(struct resource), + GFP_KERNEL); + else + res = kzalloc(sizeof(struct resource), GFP_KERNEL); if (!res) { err = -ENOMEM; goto parse_failed; @@ -365,7 +372,7 @@ int of_pci_get_host_bridge_resources(struct device_node *dev_node, unsigned char busno, unsigned char bus_max, struct list_head *resources, resource_size_t *io_base) { - return __of_pci_get_host_bridge_resources(dev_node, busno, + return __of_pci_get_host_bridge_resources(NULL, dev_node, busno, bus_max, resources, io_base); } EXPORT_SYMBOL_GPL(of_pci_get_host_bridge_resources); -- 2.13.6
next prev parent reply other threads:[~2018-04-30 5:49 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-30 5:48 [PATCH v2 00/10] PCI: leak fixes, removable generic PCI host, assorted stuff Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` [PATCH v2 01/10] PCI: Make pci_get_new_domain_nr() static Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` [PATCH v2 02/10] PCI: Fix memory leak of devm_pci_alloc_host_bridge() Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` [PATCH v2 03/10] PCI: Factor out __of_pci_get_host_bridge_resources() Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-03 7:14 ` Vladimir Zapolskiy 2018-05-03 7:14 ` Vladimir Zapolskiy 2018-04-30 5:48 ` Jan Kiszka [this message] 2018-04-30 5:48 ` [PATCH v2 04/10] PCI: Add dev parameter to __of_pci_get_host_bridge_resources() Jan Kiszka 2018-05-03 7:14 ` Vladimir Zapolskiy 2018-05-03 7:14 ` Vladimir Zapolskiy 2018-04-30 5:48 ` [PATCH v2 05/10] PCI: Replace pr_*() with dev_*() in __of_pci_get_host_bridge_resources() Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-03 7:15 ` Vladimir Zapolskiy 2018-05-03 7:15 ` Vladimir Zapolskiy 2018-05-03 7:15 ` Vladimir Zapolskiy 2018-04-30 5:48 ` [PATCH v2 06/10] PCI: Introduce devm_of_pci_get_host_bridge_resources() Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-03 7:15 ` Vladimir Zapolskiy 2018-05-03 7:15 ` Vladimir Zapolskiy 2018-04-30 5:48 ` [PATCH v2 07/10] PCI: Convert of_pci_get_host_bridge_resources() users to devm variant Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-03 7:18 ` Vladimir Zapolskiy 2018-05-03 7:18 ` Vladimir Zapolskiy 2018-05-04 16:44 ` Lorenzo Pieralisi 2018-05-04 16:44 ` Lorenzo Pieralisi 2018-05-04 16:44 ` Lorenzo Pieralisi 2018-05-05 7:42 ` Vladimir Zapolskiy 2018-05-05 7:42 ` Vladimir Zapolskiy 2018-05-05 7:42 ` Vladimir Zapolskiy 2018-04-30 5:48 ` [PATCH v2 08/10] PCI: Deprecate of_pci_get_host_bridge_resources() Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-02 12:39 ` Christoph Hellwig 2018-05-02 12:39 ` Christoph Hellwig 2018-05-02 12:39 ` Christoph Hellwig 2018-05-03 7:53 ` Jan Kiszka 2018-05-03 7:53 ` Jan Kiszka 2018-05-03 7:53 ` Jan Kiszka 2018-05-08 13:29 ` Bjorn Helgaas 2018-05-08 13:29 ` Bjorn Helgaas 2018-05-08 13:29 ` Bjorn Helgaas 2018-05-09 19:03 ` [PATCH v3 08/10] PCI: Remove of_pci_get_host_bridge_resources() Jan Kiszka 2018-05-09 19:03 ` Jan Kiszka 2018-04-30 5:48 ` [PATCH v2 09/10] PCI: Add support for unbinding the generic PCI host controller Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` [PATCH v2 10/10] PCI: Enable PCI_DOMAINS along with " Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-04-30 5:48 ` Jan Kiszka 2018-05-03 7:12 ` [PATCH v2 00/10] PCI: leak fixes, removable generic PCI host, assorted stuff Vladimir Zapolskiy 2018-05-03 7:12 ` Vladimir Zapolskiy 2018-05-03 7:12 ` Vladimir Zapolskiy 2018-05-03 7:52 ` Jan Kiszka 2018-05-03 7:52 ` Jan Kiszka 2018-05-03 7:52 ` Jan Kiszka 2018-05-10 22:51 ` Bjorn Helgaas 2018-05-10 22:51 ` Bjorn Helgaas 2018-05-10 22:51 ` Bjorn Helgaas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=cfab525f3d0436f75187fbd65907ada909d7692f.1525067324.git.jan.kiszka@siemens.com \ --to=jan.kiszka@siemens.com \ --cc=bhelgaas@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.