From: "Krzysztof Wilczyński" <kw@linux.com>
To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: lpieralisi@kernel.org, robh@kernel.org, bhelgaas@google.com,
jingoohan1@gmail.com, gustavo.pimentel@synopsys.com,
mani@kernel.org, linux-pci@vger.kernel.org,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v4 0/6] PCI: controllers: tidy code up
Date: Sat, 6 Jan 2024 17:42:54 +0900 [thread overview]
Message-ID: <20240106084254.GE1227754@rocinante> (raw)
In-Reply-To: <20240106083340.GD1227754@rocinante>
Hello,
> > This patch series tidies the code of PCIe dwc controllers and some
> > controllers up.
>
> Applied to controller/dwc, thank you!
>
> [01/06] PCI: dwc: Drop host prefix from struct dw_pcie_host_ops members
> https://git.kernel.org/pci/pci/c/aea370b2aec9
> [02/06] PCI: dwc: Rename .ep_init to .init in struct dw_pcie_ep_ops
> https://git.kernel.org/pci/pci/c/756dcb5a820a
> [03/06] PCI: dwc: Rename .func_conf_select to .get_dbi_offset in struct dw_pcie_ep_ops
> https://git.kernel.org/pci/pci/c/641f79beeebc
> [04/06] PCI: dwc: Add dw_pcie_ep_{read,write}_dbi[2] helpers
> https://git.kernel.org/pci/pci/c/70fa02ca1446
> [05/06] PCI: iproc: Fix -Wvoid-pointer-to-enum-cast warning
> https://git.kernel.org/pci/pci/c/f72896721621
> [06/06] PCI: rcar-gen4: Fix -Wvoid-pointer-to-enum-cast error
> https://git.kernel.org/pci/pci/c/7682f19c3c8c
Bjorn, there will be a minor conflict with the controller/layerscape branch
when you pull these changes to apply against our "next"—a side effect of
this particular series, which was rebased against our "next" rather than
being kept aligned with our HEAD branch, no longer including changes
against Frank Li's updates to the driver.
The following simple patch would be needed:
diff --git i/drivers/pci/controller/dwc/pci-layerscape.c w/drivers/pci/controller/dwc/pci-layerscape.c
index 7cdada200de7..9db079bbd947 100644
--- i/drivers/pci/controller/dwc/pci-layerscape.c
+++ w/drivers/pci/controller/dwc/pci-layerscape.c
@@ -278,7 +278,7 @@ static const struct dw_pcie_host_ops ls_pcie_host_ops = {
};
static const struct dw_pcie_host_ops ls1021a_pcie_host_ops = {
- .host_init = ls_pcie_host_init,
+ .init = ls_pcie_host_init,
.pme_turn_off = ls1021a_pcie_send_turnoff_msg,
};
@@ -290,7 +290,7 @@ static const struct ls_pcie_drvdata ls1021a_drvdata = {
};
static const struct dw_pcie_host_ops ls1043a_pcie_host_ops = {
- .host_init = ls_pcie_host_init,
+ .init = ls_pcie_host_init,
.pme_turn_off = ls1043a_pcie_send_turnoff_msg,
};
Krzysztof
prev parent reply other threads:[~2024-01-06 8:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 5:38 [PATCH v4 0/6] PCI: controllers: tidy code up Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 1/6] PCI: dwc: Drop host prefix from struct dw_pcie_host_ops Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 2/6] PCI: dwc: Rename to .init in struct dw_pcie_ep_ops Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 3/6] PCI: dwc: Rename to .get_dbi_offset " Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 4/6] PCI: dwc: Add dw_pcie_ep_{read,write}_dbi[2] helpers Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 5/6] PCI: iproc: fix -Wvoid-pointer-to-enum-cast warning Yoshihiro Shimoda
2023-12-20 5:38 ` [PATCH v4 6/6] PCI: rcar-gen4: " Yoshihiro Shimoda
2023-12-20 15:20 ` [PATCH v4 0/6] PCI: controllers: tidy code up Serge Semin
2024-01-05 10:59 ` Yoshihiro Shimoda
2024-01-06 5:27 ` Krzysztof Wilczyński
2024-01-09 1:34 ` Yoshihiro Shimoda
2024-01-10 0:21 ` Bjorn Helgaas
2024-01-10 2:01 ` Yoshihiro Shimoda
2024-01-06 8:33 ` Krzysztof Wilczyński
2024-01-06 8:42 ` Krzysztof Wilczyński [this message]
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=20240106084254.GE1227754@rocinante \
--to=kw@linux.com \
--cc=bhelgaas@google.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=jingoohan1@gmail.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=robh@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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 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.