On Tue, Nov 23, 2021 at 04:38:34PM +0100, Fan Fei wrote: > Remove "device *" in structs that refer struct dw_pcie or cdns_pcie. > Because these two struct contain a "struct device *" already. > > Fan Fei (4): > PCI: j721e: Remove cast of void* type > PCI: tegra194: Remove device * in struct > PCI: al: Remove device * in struct > PCI: j721e: Remove device * in struct > > drivers/pci/controller/cadence/pci-j721e.c | 14 ++- > drivers/pci/controller/dwc/pcie-al.c | 10 +- > drivers/pci/controller/dwc/pcie-tegra194.c | 109 +++++++++++---------- > 3 files changed, 69 insertions(+), 64 deletions(-) Your "Prefer of_device_get_match_data()" series applies cleanly on my "main" branch. But this series doesn't apply cleanly on "main" (v5.16-rc1) or on top of the "Prefer of_device_get_match_data()" series. Can you rebase to apply on v5.16-rc1 or, if there are conflicts with the previous series, on top of that previous series? Bjorn