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: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index ea789376de0f8cfa7442edb2ddcfb6cde5bb2ef0..6d503392341ef1a16ad5ef4ff43da2f47062cd3c 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -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;
 

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 7642ced3143644c01484ca9dbd5617d7fa96ddfc..89f1ccdc3b9830bebe06aca5aaa02951f42c7e88 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -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

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index e4109a83e628072f1b701fdc7521929fa30547f9..87829a2444651732b1b05037fbf8103983bce2b6 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -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);