| Message ID | 1451998831-27705-2-git-send-email-phil.edworthy@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hi Phil, On Tue, Jan 05, 2016 at 01:00:28PM +0000, Phil Edworthy wrote: > Commit b3a72384fe29 ("ARM/PCI: Replace pci_sys_data->align_resource > with global function pointer") removed the struct pci_sys_data > dependency from the ARM pcibios functions, so remove it from this > driver. I am a little confused by this as I still see two instances of the following in bios32.c as of the commit above. struct pci_sys_data *sys = dev->sysdata; -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jan 08, 2016 at 10:50:57AM +0900, Simon Horman wrote: > Hi Phil, > > On Tue, Jan 05, 2016 at 01:00:28PM +0000, Phil Edworthy wrote: > > Commit b3a72384fe29 ("ARM/PCI: Replace pci_sys_data->align_resource > > with global function pointer") removed the struct pci_sys_data > > dependency from the ARM pcibios functions, so remove it from this > > driver. > > I am a little confused by this as I still see two instances of > the following in bios32.c as of the commit above. > > struct pci_sys_data *sys = dev->sysdata; This patch only removes a pci_sys_data struct from pcie-rcar.c. That struct was previously used by pci_common_init_dev() and by the ARM pcibios_align_resource(). After cbce7900598c ("PCI: designware: Make driver arch-agnostic"), none of the DesignWare drivers use pci_common_init_dev(), and after b3a72384fe29, ARM doesn't need pci_sys_data for pcibios_align_resource(). Phil can correct me if I'm wrong, but I think this patch is probably OK. I guess we can tell after I apply it and get a build test :) Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Bjorn, On 08 January 2016 21:07, Bjorn Helgaas wrote: > On Fri, Jan 08, 2016 at 10:50:57AM +0900, Simon Horman wrote: > > Hi Phil, > > > > On Tue, Jan 05, 2016 at 01:00:28PM +0000, Phil Edworthy wrote: > > > Commit b3a72384fe29 ("ARM/PCI: Replace pci_sys_data->align_resource > > > with global function pointer") removed the struct pci_sys_data > > > dependency from the ARM pcibios functions, so remove it from this > > > driver. > > > > I am a little confused by this as I still see two instances of > > the following in bios32.c as of the commit above. > > > > struct pci_sys_data *sys = dev->sysdata; > > This patch only removes a pci_sys_data struct from pcie-rcar.c. That > struct was previously used by pci_common_init_dev() and by the ARM > pcibios_align_resource(). > > After cbce7900598c ("PCI: designware: Make driver arch-agnostic"), none of > the DesignWare drivers use pci_common_init_dev(), and after b3a72384fe29, > ARM doesn't need pci_sys_data for pcibios_align_resource(). > > Phil can correct me if I'm wrong, but I think this patch is probably OK. You are absolutely right! > I guess we can tell after I apply it and get a build test :) Yes, it has been built and run on both ARM and ARM64 boards. Thanks Phil -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 5c29626..c72c0ae 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -124,16 +124,7 @@ static inline struct rcar_msi *to_rcar_msi(struct msi_controller *chip) } /* Structure representing the PCIe interface */ -/* - * ARM pcibios functions expect the ARM struct pci_sys_data as the PCI - * sysdata. Add pci_sys_data as the first element in struct gen_pci so - * that when we use a gen_pci pointer as sysdata, it is also a pointer to - * a struct pci_sys_data. - */ struct rcar_pcie { -#ifdef CONFIG_ARM - struct pci_sys_data sys; -#endif struct device *dev; void __iomem *base; struct list_head resources;
Commit b3a72384fe29 ("ARM/PCI: Replace pci_sys_data->align_resource with global function pointer") removed the struct pci_sys_data dependency from the ARM pcibios functions, so remove it from this driver. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> --- v2: - No changes. --- drivers/pci/host/pcie-rcar.c | 9 --------- 1 file changed, 9 deletions(-)