[dpdk-dev] [PATCH 1/6] eal: Fix cording style of eal_pci.c and eal_pci_uio.c

[Bruce Richardson]

On Tue, Mar 17, 2015 at 06:30:40PM +0900, Tetsuya Mukawa wrote:
> This patch fixes cording style of below files in linuxapp and bsdapp.
>  - eal_pci.c
>  - eal_pci_uio.c
> 
> Signed-off-by: Tetsuya Mukawa <mukawa at igel.co.jp>

Acked-by: Bruce Richardson <bruce.richardson at intel.com>

> ---
>  lib/librte_eal/bsdapp/eal/eal_pci.c       | 24 +++++++++++++-----------
>  lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 12 ++++++++----
>  2 files changed, 21 insertions(+), 15 deletions(-)
> 
> diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
> index fe3ef86..3a22b49 100644
> --- a/lib/librte_eal/bsdapp/eal/eal_pci.c
> +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
> @@ -161,9 +161,10 @@ fail:
>  static int
>  pci_uio_map_secondary(struct rte_pci_device *dev)
>  {
> -        size_t i;
> -        struct uio_resource *uio_res;
> -	struct uio_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
> +	size_t i;
> +	struct uio_resource *uio_res;
> +	struct uio_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
>  
>  	TAILQ_FOREACH(uio_res, uio_res_list, next) {
>  
> @@ -179,10 +180,10 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
>  			    != uio_res->maps[i].addr) {
>  				RTE_LOG(ERR, EAL,
>  					"Cannot mmap device resource\n");
> -				return (-1);
> +				return -1;
>  			}
>  		}
> -		return (0);
> +		return 0;
>  	}
>  
>  	RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
> @@ -201,7 +202,8 @@ pci_uio_map_resource(struct rte_pci_device *dev)
>  	uint64_t pagesz;
>  	struct rte_pci_addr *loc = &dev->addr;
>  	struct uio_resource *uio_res;
> -	struct uio_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
> +	struct uio_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list);
>  	struct uio_map *maps;
>  
>  	dev->intr_handle.fd = -1;
> @@ -209,7 +211,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);
>  
>  	snprintf(devname, sizeof(devname), "/dev/uio at pci:%u:%u:%u",
>  			dev->addr.bus, dev->addr.devid, dev->addr.function);
> @@ -233,7 +235,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
>  	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;
>  	}
>  
>  	snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
> @@ -261,7 +263,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
>  						(size_t)maps[j].size)
>  		    ) == NULL) {
>  			rte_free(uio_res);
> -			return (-1);
> +			return -1;
>  		}
>  
>  		maps[j].addr = mapaddr;
> @@ -271,7 +273,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
>  
>  	TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
>  
> -	return (0);
> +	return 0;
>  }
>  
>  /* Scan one pci sysfs entry, and fill the devices list from it. */
> @@ -311,7 +313,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
>  	/* FreeBSD has no NUMA support (yet) */
>  	dev->numa_node = 0;
>  
> -/* parse resources */
> +	/* parse resources */
>  	switch (conf->pc_hdr & PCIM_HDRTYPE) {
>  	case PCIM_HDRTYPE_NORMAL:
>  		max = PCIR_MAX_BAR_0;
> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
> index 2d1c69b..9cdf24f 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
> @@ -92,7 +92,8 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
>  {
>  	int fd, i;
>  	struct mapped_pci_resource *uio_res;
> -	struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
> +	struct mapped_pci_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
>  
>  	TAILQ_FOREACH(uio_res, uio_res_list, next) {
>  
> @@ -272,7 +273,8 @@ pci_uio_map_resource(struct rte_pci_device *dev)
>  	uint64_t phaddr;
>  	struct rte_pci_addr *loc = &dev->addr;
>  	struct mapped_pci_resource *uio_res;
> -	struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
> +	struct mapped_pci_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
>  	struct pci_map *maps;
>  
>  	dev->intr_handle.fd = -1;
> @@ -412,7 +414,8 @@ static struct mapped_pci_resource *
>  pci_uio_find_resource(struct rte_pci_device *dev)
>  {
>  	struct mapped_pci_resource *uio_res;
> -	struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
> +	struct mapped_pci_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
>  
>  	if (dev == NULL)
>  		return NULL;
> @@ -431,7 +434,8 @@ void
>  pci_uio_unmap_resource(struct rte_pci_device *dev)
>  {
>  	struct mapped_pci_resource *uio_res;
> -	struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
> +	struct mapped_pci_res_list *uio_res_list =
> +			RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
>  
>  	if (dev == NULL)
>  		return;
> -- 
> 1.9.1
>