[dpdk-dev] [PATCH v4 03/20] pci: fixing errors in a previous commit found by checkpatch
Anatoly Burakov
anatoly.burakov at intel.com
Tue Jun 3 12:17:52 CEST 2014
Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
index 61f09cc..ae4e716 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -69,7 +69,7 @@ pci_uio_get_mappings(const char *devname, struct pci_map maps[], int nb_maps) {
if (pci_parse_sysfs_value(filename, &offset) < 0) {
RTE_LOG(ERR, EAL,
"%s(): cannot parse offset of %s\n", __func__, dirname);
- return (-1);
+ return -1;
}
/* get mapping size */
@@ -77,7 +77,7 @@ pci_uio_get_mappings(const char *devname, struct pci_map maps[], int nb_maps) {
if (pci_parse_sysfs_value(filename, &size) < 0) {
RTE_LOG(ERR, EAL,
"%s(): cannot parse size of %s\n", __func__, dirname);
- return (-1);
+ return -1;
}
/* get mapping physical address */
@@ -85,20 +85,20 @@ pci_uio_get_mappings(const char *devname, struct pci_map maps[], int nb_maps) {
if (pci_parse_sysfs_value(filename, &maps[i].phaddr) < 0) {
RTE_LOG(ERR, EAL,
"%s(): cannot parse addr of %s\n", __func__, dirname);
- return (-1);
+ return -1;
}
if ((offset > OFF_MAX) || (size > SIZE_MAX)) {
RTE_LOG(ERR, EAL,
"%s(): offset/size exceed system max value\n", __func__);
- return (-1);
+ return -1;
}
maps[i].offset = offset;
maps[i].size = size;
}
- return (i);
+ return i;
}
static int
@@ -128,12 +128,12 @@ pci_uio_map_secondary(struct rte_pci_device *dev) {
(size_t) uio_res->maps[i].size) != uio_res->maps[i].addr) {
RTE_LOG(ERR, EAL, "Cannot mmap device resource\n");
close(fd);
- return (-1);
+ return -1;
}
/* fd is not needed in slave process, close it */
close(fd);
}
- return (0);
+ return 0;
}
RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
@@ -277,7 +277,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) {
/* secondary processes - use already recorded details */
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
- return (pci_uio_map_secondary(dev));
+ return pci_uio_map_secondary(dev);
/* find uio resource */
uio_num = pci_get_uio_dev(dev, dirname, sizeof(dirname));
@@ -299,7 +299,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) {
/* allocate the mapping details for secondary processes*/
if ((uio_res = rte_zmalloc("UIO_RES", sizeof(*uio_res), 0)) == NULL) {
RTE_LOG(ERR, EAL, "%s(): cannot store uio mmap details\n", __func__);
- return (-1);
+ return -1;
}
rte_snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
@@ -310,7 +310,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) {
RTE_DIM(uio_res->maps));
if (nb_maps < 0) {
rte_free(uio_res);
- return (nb_maps);
+ return nb_maps;
}
uio_res->nb_maps = nb_maps;
--
1.8.1.4
More information about the dev
mailing list