staging: vchiq_arm: get rid of vchi_mh.h

[linux-2.6-microblaze.git] / drivers / staging / vc04_services / interface / vchiq_arm / vchiq_core.c

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 7642ced..8c7bda2 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -3313,10 +3313,10 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
  * When called in blocking mode, the userdata field points to a bulk_waiter
  * structure.
  */
-VCHIQ_STATUS_T
-vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
-       VCHI_MEM_HANDLE_T memhandle, void *offset, int size, void *userdata,
-       VCHIQ_BULK_MODE_T mode, VCHIQ_BULK_DIR_T dir)
+VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
+                                  void *offset, int size, void *userdata,
+                                  VCHIQ_BULK_MODE_T mode,
+                                  VCHIQ_BULK_DIR_T dir)
 {
        VCHIQ_SERVICE_T *service = find_service_by_handle(handle);
        VCHIQ_BULK_QUEUE_T *queue;
@@ -3328,10 +3328,8 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
                VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;
        VCHIQ_STATUS_T status = VCHIQ_ERROR;
 
-       if (!service ||
-                (service->srvstate != VCHIQ_SRVSTATE_OPEN) ||
-                ((memhandle == VCHI_MEM_HANDLE_INVALID) && (offset == NULL)) ||
-                (vchiq_check_service(service) != VCHIQ_SUCCESS))
+       if (!service || service->srvstate != VCHIQ_SRVSTATE_OPEN ||
+           !offset || vchiq_check_service(service) != VCHIQ_SUCCESS)
                goto error_exit;
 
        switch (mode) {
@@ -3388,8 +3386,7 @@ vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
        bulk->size = size;
        bulk->actual = VCHIQ_BULK_ACTUAL_ABORTED;
 
-       if (vchiq_prepare_bulk_data(bulk, memhandle, offset, size, dir) !=
-               VCHIQ_SUCCESS)
+       if (vchiq_prepare_bulk_data(bulk, offset, size, dir) != VCHIQ_SUCCESS)
                goto unlock_error_exit;
 
        wmb();
@@ -3583,28 +3580,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