Commit 49fa9157 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_core: rework vchiq_get_config 



The function is overly complicated for what it's ultimately achieving.
It's simply filling up a structure.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3885feb

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+5 −7
Original line number Diff line number Diff line
@@ -1480,14 +1480,12 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			ret = -EINVAL;

			break;

		}

		status = vchiq_get_config(instance, args.config_size, &config);

		if (status == VCHIQ_SUCCESS) {

			if (copy_to_user((void __user *)args.pconfig,

				    &config, args.config_size) != 0) {



		vchiq_get_config(&config);

		if (copy_to_user(args.pconfig, &config, args.config_size)) {

			ret = -EFAULT;

			break;

		}

		}

	} break;



	case VCHIQ_IOC_SET_SERVICE_OPTION: {

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+8 −22
Original line number Diff line number Diff line
@@ -3583,28 +3583,14 @@ exit: 
	return status;

}



VCHIQ_STATUS_T

vchiq_get_config(VCHIQ_INSTANCE_T instance,

	int config_size, VCHIQ_CONFIG_T *pconfig)

{

	VCHIQ_CONFIG_T config;



	(void)instance;



	config.max_msg_size           = VCHIQ_MAX_MSG_SIZE;

	config.bulk_threshold         = VCHIQ_MAX_MSG_SIZE;

	config.max_outstanding_bulks  = VCHIQ_NUM_SERVICE_BULKS;

	config.max_services           = VCHIQ_MAX_SERVICES;

	config.version                = VCHIQ_VERSION;

	config.version_min            = VCHIQ_VERSION_MIN;



	if (config_size > sizeof(VCHIQ_CONFIG_T))

		return VCHIQ_ERROR;



	memcpy(pconfig, &config,

		min(config_size, (int)(sizeof(VCHIQ_CONFIG_T))));



	return VCHIQ_SUCCESS;

void vchiq_get_config(VCHIQ_CONFIG_T *config)

{

	config->max_msg_size           = VCHIQ_MAX_MSG_SIZE;

	config->bulk_threshold         = VCHIQ_MAX_MSG_SIZE;

	config->max_outstanding_bulks  = VCHIQ_NUM_SERVICE_BULKS;

	config->max_services           = VCHIQ_MAX_SERVICES;

	config->version                = VCHIQ_VERSION;

	config->version_min            = VCHIQ_VERSION_MIN;

}



VCHIQ_STATUS_T

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service, 
extern int   vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);

extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);

extern int   vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);

extern VCHIQ_STATUS_T vchiq_get_config(VCHIQ_INSTANCE_T instance,

	int config_size, VCHIQ_CONFIG_T *pconfig);

extern void vchiq_get_config(VCHIQ_CONFIG_T *config);

extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,

	VCHIQ_SERVICE_OPTION_T option, int value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE