2021-06-10 16:08:11

by Logan Gunthorpe

[permalink] [raw]
Subject: [PATCH v1 3/6] PCI/P2PDMA: Cleanup type for return value of calc_map_type_and_dist()

Instead of using an int for the return value of this function use the
correct enum pci_p2pdma_map_type.

Signed-off-by: Logan Gunthorpe <[email protected]>
---
drivers/pci/p2pdma.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 3a5fb63c5f2c..09c864f193d2 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -544,11 +544,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;
@@ -563,15 +563,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)
--
2.20.1