| Message ID | cover.1637678103.git.ffclaire1224@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | PCI: Prefer of_device_get_match_data() over of_match_device() | expand |
On Tue, Nov 23, 2021 at 04:37:55PM +0100, Fan Fei wrote: > Some drivers use of_match_device() in probe(), which returns a > "struct of_device_id *". They need only the of_device_id.data member, so > replace of_device_get_match_data() with of_match_device(). > > Fan Fei (7): > PCI: altera: Prefer of_device_get_match_data() over of_match_device() > PCI: cadence: Prefer of_device_get_match_data() over of_match_device() > PCI: kirin: Prefer of_device_get_match_data() over of_match_device() > PCI: dra7xx: Prefer of_device_get_match_data() over of_match_device() > PCI: keystone: Prefer of_device_get_match_data() over > of_match_device() > PCI: artpec6: Prefer of_device_get_match_data() over of_match_device() > PCI: dwc: Prefer of_device_get_match_data() over of_device_device() > > drivers/pci/controller/cadence/pcie-cadence-plat.c | 6 ++---- > drivers/pci/controller/dwc/pci-dra7xx.c | 6 ++---- > drivers/pci/controller/dwc/pci-keystone.c | 4 +--- > drivers/pci/controller/dwc/pcie-artpec6.c | 6 ++---- > drivers/pci/controller/dwc/pcie-designware-plat.c | 6 ++---- > drivers/pci/controller/dwc/pcie-kirin.c | 6 ++---- > drivers/pci/controller/pcie-altera.c | 8 ++++---- > 7 files changed, 15 insertions(+), 27 deletions(-) Applied to pci/driver-cleanup for v5.17, thank you, Fan!
On Wed, Dec 08, 2021 at 02:50:47PM -0600, Bjorn Helgaas wrote: > On Tue, Nov 23, 2021 at 04:37:55PM +0100, Fan Fei wrote: > > Some drivers use of_match_device() in probe(), which returns a > > "struct of_device_id *". They need only the of_device_id.data member, so > > replace of_device_get_match_data() with of_match_device(). > > > > Fan Fei (7): > > PCI: altera: Prefer of_device_get_match_data() over of_match_device() > > PCI: cadence: Prefer of_device_get_match_data() over of_match_device() > > PCI: kirin: Prefer of_device_get_match_data() over of_match_device() > > PCI: dra7xx: Prefer of_device_get_match_data() over of_match_device() > > PCI: keystone: Prefer of_device_get_match_data() over > > of_match_device() > > PCI: artpec6: Prefer of_device_get_match_data() over of_match_device() > > PCI: dwc: Prefer of_device_get_match_data() over of_device_device() > > > > drivers/pci/controller/cadence/pcie-cadence-plat.c | 6 ++---- > > drivers/pci/controller/dwc/pci-dra7xx.c | 6 ++---- > > drivers/pci/controller/dwc/pci-keystone.c | 4 +--- > > drivers/pci/controller/dwc/pcie-artpec6.c | 6 ++---- > > drivers/pci/controller/dwc/pcie-designware-plat.c | 6 ++---- > > drivers/pci/controller/dwc/pcie-kirin.c | 6 ++---- > > drivers/pci/controller/pcie-altera.c | 8 ++++---- > > 7 files changed, 15 insertions(+), 27 deletions(-) > > Applied to pci/driver-cleanup for v5.17, thank you, Fan! Also applied the following patch since it's closely related. commit 667c60afad25 ("PCI: j721e: Drop pointless of_device_get_match_data() cast") Author: Bjorn Helgaas <bhelgaas@google.com> Date: Wed Dec 8 15:18:20 2021 -0600 PCI: j721e: Drop pointless of_device_get_match_data() cast of_device_get_match_data() returns "void *", so no cast is needed when assigning the result to a pointer type. Drop the unnecessary cast. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c index 918e11082e6a..0aa1c184bd42 100644 --- a/drivers/pci/controller/cadence/pci-j721e.c +++ b/drivers/pci/controller/cadence/pci-j721e.c @@ -367,7 +367,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) int ret; int irq; - data = (struct j721e_pcie_data *)of_device_get_match_data(dev); + data = of_device_get_match_data(dev); if (!data) return -EINVAL;
Some drivers use of_match_device() in probe(), which returns a "struct of_device_id *". They need only the of_device_id.data member, so replace of_device_get_match_data() with of_match_device(). Fan Fei (7): PCI: altera: Prefer of_device_get_match_data() over of_match_device() PCI: cadence: Prefer of_device_get_match_data() over of_match_device() PCI: kirin: Prefer of_device_get_match_data() over of_match_device() PCI: dra7xx: Prefer of_device_get_match_data() over of_match_device() PCI: keystone: Prefer of_device_get_match_data() over of_match_device() PCI: artpec6: Prefer of_device_get_match_data() over of_match_device() PCI: dwc: Prefer of_device_get_match_data() over of_device_device() drivers/pci/controller/cadence/pcie-cadence-plat.c | 6 ++---- drivers/pci/controller/dwc/pci-dra7xx.c | 6 ++---- drivers/pci/controller/dwc/pci-keystone.c | 4 +--- drivers/pci/controller/dwc/pcie-artpec6.c | 6 ++---- drivers/pci/controller/dwc/pcie-designware-plat.c | 6 ++---- drivers/pci/controller/dwc/pcie-kirin.c | 6 ++---- drivers/pci/controller/pcie-altera.c | 8 ++++---- 7 files changed, 15 insertions(+), 27 deletions(-)