staging: vc04_services: Replace VCHIQ_BULK_MODE_T enum typedef with enum vchiq_bulk_mode

Replaces VCHIQ_BULK_MODE_T enum typedef with enum vchiq_bulk_mode to
match kernel code style. Issue found by checkpatch.

Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
Link: https://lore.kernel.org/r/667037e1810921e30371dbeb52c1ae489bf31f8c.1572994235.git.jamal.k.shareef@gmail.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 edc7728..8c791e9 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -382,7 +382,7 @@ EXPORT_SYMBOL(vchiq_open_service);
 
 enum vchiq_status
 vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
-       unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
+       unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
 {
        enum vchiq_status status;
 
@@ -407,7 +407,7 @@ EXPORT_SYMBOL(vchiq_bulk_transmit);
 
 enum vchiq_status
 vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
-       unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
+       unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
 {
        enum vchiq_status status;
 
@@ -1107,7 +1107,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                        }
                        kfree(waiter);
                } else {
-                       const VCHIQ_BULK_MODE_T mode_waiting =
+                       const enum vchiq_bulk_mode mode_waiting =
                                VCHIQ_BULK_MODE_WAITING;
                        waiter->pid = current->pid;
                        mutex_lock(&instance->bulk_waiter_list_mutex);
@@ -1611,7 +1611,7 @@ struct vchiq_queue_bulk_transfer32 {
        compat_uptr_t data;
        unsigned int size;
        compat_uptr_t userdata;
-       VCHIQ_BULK_MODE_T mode;
+       enum vchiq_bulk_mode mode;
 };
 
 #define VCHIQ_IOC_QUEUE_BULK_TRANSMIT32 \

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 55caf0f..380f93a 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -2954,7 +2954,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
  */
 enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
                                   void *offset, int size, void *userdata,
-                                  VCHIQ_BULK_MODE_T mode,
+                                  enum vchiq_bulk_mode mode,
                                   VCHIQ_BULK_DIR_T dir)
 {
        struct vchiq_service *service = find_service_by_handle(handle);

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index bfee311..6a6ae0c 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -523,7 +523,7 @@ remote_event_pollall(struct vchiq_state *state);
 
 extern enum vchiq_status
 vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *offset, int size,
-                   void *userdata, VCHIQ_BULK_MODE_T mode,
+                   void *userdata, enum vchiq_bulk_mode mode,
                    VCHIQ_BULK_DIR_T dir);
 
 extern void

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 89646d2..5404e51 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -31,12 +31,12 @@ enum vchiq_status {
        VCHIQ_RETRY   = 1
 };
 
-typedef enum {
+enum vchiq_bulk_mode {
        VCHIQ_BULK_MODE_CALLBACK,
        VCHIQ_BULK_MODE_BLOCKING,
        VCHIQ_BULK_MODE_NOCALLBACK,
        VCHIQ_BULK_MODE_WAITING         /* Reserved for internal use */
-} VCHIQ_BULK_MODE_T;
+};
 
 typedef enum {
        VCHIQ_SERVICE_OPTION_AUTOCLOSE,
@@ -118,16 +118,16 @@ extern void           vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
        struct vchiq_header *header);
 extern enum vchiq_status vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
        const void *data, unsigned int size, void *userdata,
-       VCHIQ_BULK_MODE_T mode);
+       enum vchiq_bulk_mode mode);
 extern enum vchiq_status vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
        void *data, unsigned int size, void *userdata,
-       VCHIQ_BULK_MODE_T mode);
+       enum vchiq_bulk_mode mode);
 extern enum vchiq_status vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
        const void *offset, unsigned int size,
-       void *userdata, VCHIQ_BULK_MODE_T mode);
+       void *userdata, enum vchiq_bulk_mode mode);
 extern enum vchiq_status vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
        void *offset, unsigned int size, void *userdata,
-       VCHIQ_BULK_MODE_T mode);
+       enum vchiq_bulk_mode mode);
 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);

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
index c2343a1..b991ce3 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -28,7 +28,7 @@ struct vchiq_queue_bulk_transfer {
        void *data;
        unsigned int size;
        void *userdata;
-       VCHIQ_BULK_MODE_T mode;
+       enum vchiq_bulk_mode mode;
 };
 
 struct vchiq_completion_data {

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index d186c38..ed6e42e 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -203,7 +203,7 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d
                                void *bulk_handle)
 {
        struct shim_service *service = (struct shim_service *)handle;
-       VCHIQ_BULK_MODE_T mode;
+       enum vchiq_bulk_mode mode;
        enum vchiq_status status;
 
        switch ((int)flags) {
@@ -263,7 +263,7 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle,
                                 void *bulk_handle)
 {
        struct shim_service *service = (struct shim_service *)handle;
-       VCHIQ_BULK_MODE_T mode;
+       enum vchiq_bulk_mode mode;
        enum vchiq_status status;
 
        switch ((int)flags) {