Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 59029739d42b439628e2f64f3d8f2db9be97deff Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Mon, 10 Jan 2022 00:15:17 +0100
|
|
Subject: [PATCH] PCI: aardvark: Use dev_fwnode() instead of
|
|
of_node_to_fwnode(dev->of_node)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use simple
|
|
dev_fwnode(dev)
|
|
instead of
|
|
struct device_node *node = dev->of_node;
|
|
of_node_to_fwnode(node)
|
|
especially since the node variable is not used elsewhere in the function.
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -1301,7 +1301,6 @@ static struct msi_domain_info advk_msi_d
|
|
static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
|
|
{
|
|
struct device *dev = &pcie->pdev->dev;
|
|
- struct device_node *node = dev->of_node;
|
|
phys_addr_t msi_msg_phys;
|
|
|
|
mutex_init(&pcie->msi_used_lock);
|
|
@@ -1320,7 +1319,7 @@ static int advk_pcie_init_msi_irq_domain
|
|
return -ENOMEM;
|
|
|
|
pcie->msi_domain =
|
|
- pci_msi_create_irq_domain(of_node_to_fwnode(node),
|
|
+ pci_msi_create_irq_domain(dev_fwnode(dev),
|
|
&advk_msi_domain_info,
|
|
pcie->msi_inner_domain);
|
|
if (!pcie->msi_domain) {
|