From: Logan Gunthorpe Date: Thu, 10 Jun 2021 16:06:06 +0000 (-0600) Subject: PCI/P2PDMA: Use correct calc_map_type_and_dist() return type X-Git-Tag: accepted/tizen/unified/20230118.172025~6867^2~20^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f9c125b9eb30650356cf582003365b1ecbd7003b;p=platform%2Fkernel%2Flinux-rpi.git PCI/P2PDMA: Use correct calc_map_type_and_dist() return type Instead of using an int for the return value of this function, use the correct enum pci_p2pdma_map_type. Link: https://lore.kernel.org/r/20210610160609.28447-4-logang@deltatee.com Signed-off-by: Logan Gunthorpe Signed-off-by: Bjorn Helgaas --- diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 109bd732..abcdb2a 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -546,11 +546,11 @@ calc_map_type_and_dist_warn(struct pci_dev *provider, struct pci_dev *client, int pci_p2pdma_distance_many(struct pci_dev *provider, struct device **clients, int num_clients, bool verbose) { + enum pci_p2pdma_map_type map; bool not_supported = false; struct pci_dev *pci_client; int total_dist = 0; - int distance; - int i, ret; + int i, distance; if (num_clients == 0) return -1; @@ -565,15 +565,15 @@ int pci_p2pdma_distance_many(struct pci_dev *provider, struct device **clients, } if (verbose) - ret = calc_map_type_and_dist_warn(provider, pci_client, + map = calc_map_type_and_dist_warn(provider, pci_client, &distance); else - ret = calc_map_type_and_dist(provider, pci_client, + map = calc_map_type_and_dist(provider, pci_client, &distance, NULL, NULL); pci_dev_put(pci_client); - if (ret == PCI_P2PDMA_MAP_NOT_SUPPORTED) + if (map == PCI_P2PDMA_MAP_NOT_SUPPORTED) not_supported = true; if (not_supported && !verbose)