From: Heiner Kallweit <hkallweit1@gmail.com>
To: "Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Oded Gabbay" <oded.gabbay@gmail.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Joerg Roedel" <joro@8bytes.org>,
"David Woodhouse" <dwmw2@infradead.org>,
"Realtek linux nic maintainers" <nic_swsd@realtek.com>,
"David S. Miller" <davem@davemloft.net>,
"Giuseppe Cavallaro" <peppe.cavallaro@st.com>,
"Alexandre Torgue" <alexandre.torgue@st.com>,
"Jose Abreu" <joabreu@synopsys.com>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Benson Leung" <bleung@chromium.org>,
"Enric Balletbo i Serra" <enric.balletbo@collabora.com>,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Paul Mackerras" <paulus@samba.org>
Cc: open list <linux-kernel@vger.kernel.org>,
"open list:AMD KFD" <dri-devel@lists.freedesktop.org>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:AMD IOMMU (AMD-VI)" <iommu@lists.linux-foundation.org>,
"open list:8169 10/100/1000 GIGABIT ETHERNET DRIVER"
<netdev@vger.kernel.org>,
"moderated list:ARM/STM32 ARCHITECTURE"
<linux-stm32@st-md-mailman.stormreply.com>,
"moderated list:ARM/STM32 ARCHITECTURE"
<linux-arm-kernel@lists.infradead.org>,
"open list:PCI SUBSYSTEM" <linux-pci@vger.kernel.org>
Subject: [PATCH v2 2/9] PCI: use helper pci_dev_id
Date: Wed, 24 Apr 2019 21:12:45 +0200 [thread overview]
Message-ID: <9cc03738-f664-3896-d8eb-48146772a655@gmail.com> (raw)
In-Reply-To: <2e1f9a57-6d08-d017-24da-3e6b97fa2449@gmail.com>
Use new helper pci_dev_id() to simplify the code.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/pci/msi.c | 6 +++---
drivers/pci/search.c | 10 +++-------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 73986825d..e039b740f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1338,7 +1338,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev,
struct msi_desc *desc)
{
return (irq_hw_number_t)desc->msi_attrib.entry_nr |
- PCI_DEVID(dev->bus->number, dev->devfn) << 11 |
+ pci_dev_id(dev) << 11 |
(pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27;
}
@@ -1508,7 +1508,7 @@ static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data)
u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)
{
struct device_node *of_node;
- u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);
+ u32 rid = pci_dev_id(pdev);
pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
@@ -1531,7 +1531,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)
struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev)
{
struct irq_domain *dom;
- u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);
+ u32 rid = pci_dev_id(pdev);
pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
dom = of_msi_map_get_device_domain(&pdev->dev, rid);
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 2b5f72086..5c7922612 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -33,7 +33,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
struct pci_bus *bus;
int ret;
- ret = fn(pdev, PCI_DEVID(pdev->bus->number, pdev->devfn), data);
+ ret = fn(pdev, pci_dev_id(pdev), data);
if (ret)
return ret;
@@ -88,9 +88,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
return ret;
continue;
case PCI_EXP_TYPE_PCIE_BRIDGE:
- ret = fn(tmp,
- PCI_DEVID(tmp->bus->number,
- tmp->devfn), data);
+ ret = fn(tmp, pci_dev_id(tmp), data);
if (ret)
return ret;
continue;
@@ -101,9 +99,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
PCI_DEVID(tmp->subordinate->number,
PCI_DEVFN(0, 0)), data);
else
- ret = fn(tmp,
- PCI_DEVID(tmp->bus->number,
- tmp->devfn), data);
+ ret = fn(tmp, pci_dev_id(tmp), data);
if (ret)
return ret;
}
--
2.21.0
next prev parent reply other threads:[~2019-04-24 19:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 19:10 [PATCH v2 0/9] PCI: add help pci_dev_id Heiner Kallweit
2019-04-24 19:11 ` [PATCH v2 1/9] PCI: add helper pci_dev_id Heiner Kallweit
2019-04-24 19:12 ` Heiner Kallweit [this message]
2019-04-24 19:13 ` [PATCH v2 3/9] r8169: use new " Heiner Kallweit
2019-04-24 19:14 ` [PATCH v2 4/9] powerpc/powernv/npu: use " Heiner Kallweit
2019-04-26 3:44 ` Alexey Kardashevskiy
2019-04-24 19:14 ` [PATCH v2 5/9] drm/amdkfd: " Heiner Kallweit
2019-04-25 6:57 ` Koenig, Christian
2019-04-24 19:15 ` [PATCH v2 6/9] iommu/amd: " Heiner Kallweit
2019-04-26 13:47 ` Joerg Roedel
2019-04-24 19:16 ` [PATCH v2 7/9] iommu/vt-d: " Heiner Kallweit
2019-04-26 13:47 ` Joerg Roedel
2019-04-24 19:16 ` [PATCH v2 8/9] stmmac: pci: " Heiner Kallweit
2019-04-24 19:17 ` [PATCH v2 9/9] platform/chrome: chromeos_laptop: " Heiner Kallweit
2019-04-25 18:21 ` Benson Leung
2019-04-29 21:14 ` [PATCH v2 0/9] PCI: add help pci_dev_id 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=9cc03738-f664-3896-d8eb-48146772a655@gmail.com \
--to=hkallweit1@gmail.com \
--cc=David1.Zhou@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=alexandre.torgue@st.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bleung@chromium.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=dwmw2@infradead.org \
--cc=enric.balletbo@collabora.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joabreu@synopsys.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=oded.gabbay@gmail.com \
--cc=paulus@samba.org \
--cc=peppe.cavallaro@st.com \
--cc=sfr@canb.auug.org.au \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®