iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: vchiq_core: rework vchiq_get_config

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

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nicolas Saenz Julienne 2018-11-20 15:53:36 +01:00 committed by Greg Kroah-Hartman
parent b3885feb8a
commit 49fa9157a4
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
View File

@ -1480,13 +1480,11 @@ 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) {
ret = -EFAULT;
break;
}
vchiq_get_config(&config);
if (copy_to_user(args.pconfig, &config, args.config_size)) {
ret = -EFAULT;
break;
}
} break;

28
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
View File

@ -3583,28 +3583,14 @@ exit:
return status;
}
VCHIQ_STATUS_T
vchiq_get_config(VCHIQ_INSTANCE_T instance,
int config_size, VCHIQ_CONFIG_T *pconfig)
void vchiq_get_config(VCHIQ_CONFIG_T *config)
{
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;
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

3
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
View File

@ -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);