Commit 410ab9b5 authored by Laurentiu Tudor's avatar Laurentiu Tudor Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: drop macros with possible side effects 



Several macros were triggering this checkpatch.pl warning:
  "Macro argument reuse '$arg' - possible side-effects?"
Fix the warning by turning them into real functions.

Signed-off-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d2176b32

drivers/staging/fsl-mc/bus/dprc-driver.c

+9 −6
Original line number Diff line number Diff line
@@ -21,15 +21,18 @@ 


#define FSL_MC_DPRC_DRIVER_NAME    "fsl_mc_dprc"



#define FSL_MC_DEVICE_MATCH(_mc_dev, _obj_desc) \

	(strcmp((_mc_dev)->obj_desc.type, (_obj_desc)->type) == 0 && \

	 (_mc_dev)->obj_desc.id == (_obj_desc)->id)



struct dprc_child_objs {

	int child_count;

	struct dprc_obj_desc *child_array;

};



static bool fsl_mc_device_match(struct fsl_mc_device *mc_dev,

				struct dprc_obj_desc *obj_desc)

{

	return !strcmp(mc_dev->obj_desc.type, obj_desc->type) &&

		mc_dev->obj_desc.id == obj_desc->id;

}



static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data)

{

	int i;
@@ -45,7 +48,7 @@ static int __fsl_mc_device_remove_if_not_in_mc(struct device *dev, void *data) 
		struct dprc_obj_desc *obj_desc = &objs->child_array[i];



		if (strlen(obj_desc->type) != 0 &&

		    FSL_MC_DEVICE_MATCH(mc_dev, obj_desc))

		    fsl_mc_device_match(mc_dev, obj_desc))

			break;

	}
@@ -105,7 +108,7 @@ static int __fsl_mc_device_match(struct device *dev, void *data) 
	struct dprc_obj_desc *obj_desc = data;

	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);



	return FSL_MC_DEVICE_MATCH(mc_dev, obj_desc);

	return fsl_mc_device_match(mc_dev, obj_desc);

}



static struct fsl_mc_device *fsl_mc_device_lookup(struct dprc_obj_desc

drivers/staging/fsl-mc/bus/fsl-mc-allocator.c

+10 −8
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
#include "dpcon-cmd.h"

#include "fsl-mc-private.h"



#define FSL_MC_IS_ALLOCATABLE(_obj_type) \

	(strcmp(_obj_type, "dpbp") == 0 || \

	 strcmp(_obj_type, "dpmcp") == 0 || \

	 strcmp(_obj_type, "dpcon") == 0)

static bool __must_check fsl_mc_is_allocatable(const char *obj_type)

{

	return strcmp(obj_type, "dpbp") == 0 ||

	       strcmp(obj_type, "dpmcp") == 0 ||

	       strcmp(obj_type, "dpcon") == 0;

}



/**

 * fsl_mc_resource_pool_add_device - add allocatable object to a resource
@@ -44,7 +46,7 @@ static int __must_check fsl_mc_resource_pool_add_device(struct fsl_mc_bus 


	if (WARN_ON(pool_type < 0 || pool_type >= FSL_MC_NUM_POOL_TYPES))

		goto out;

	if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))

	if (WARN_ON(!fsl_mc_is_allocatable(mc_dev->obj_desc.type)))

		goto out;

	if (WARN_ON(mc_dev->resource))

		goto out;
@@ -106,7 +108,7 @@ static int __must_check fsl_mc_resource_pool_remove_device(struct fsl_mc_device 
	struct fsl_mc_resource *resource;

	int error = -EINVAL;



	if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))

	if (WARN_ON(!fsl_mc_is_allocatable(mc_dev->obj_desc.type)))

		goto out;



	resource = mc_dev->resource;
@@ -586,7 +588,7 @@ static int fsl_mc_allocator_probe(struct fsl_mc_device *mc_dev) 
	struct fsl_mc_bus *mc_bus;

	int error;



	if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))

	if (WARN_ON(!fsl_mc_is_allocatable(mc_dev->obj_desc.type)))

		return -EINVAL;



	mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
@@ -615,7 +617,7 @@ static int fsl_mc_allocator_remove(struct fsl_mc_device *mc_dev) 
{

	int error;



	if (WARN_ON(!FSL_MC_IS_ALLOCATABLE(mc_dev->obj_desc.type)))

	if (WARN_ON(!fsl_mc_is_allocatable(mc_dev->obj_desc.type)))

		return -EINVAL;



	if (mc_dev->resource) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE