On Thu, 3 Oct 2019, Nachammai Karuppiah wrote:
> Avoid typedefs to maintain kernel coding style. Issue found by
> checkpatch.pl
>
> Replace the enum typedef VCHIQ_REASON_T with vchiq_reason.
Would it be possible to get rid of them all? They seem to all go
together, since they start with the same prefix, and they all don't look
nice at all.
The changes so far seem to be going in the right direction.
julia
>
> Signed-off-by: Nachammai Karuppiah <nachukannan@xxxxxxxxx>
> ---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++----
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 4 ++--
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 6 +++---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 2 +-
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 2 +-
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> 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 b1595b1..280e237 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> @@ -516,7 +516,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> ***************************************************************************/
>
> static VCHIQ_STATUS_T
> -add_completion(VCHIQ_INSTANCE_T instance, VCHIQ_REASON_T reason,
> +add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
> struct vchiq_header *header, struct user_service *user_service,
> void *bulk_userdata)
> {
> @@ -583,7 +583,7 @@ add_completion(VCHIQ_INSTANCE_T instance, VCHIQ_REASON_T reason,
> ***************************************************************************/
>
> static VCHIQ_STATUS_T
> -service_callback(VCHIQ_REASON_T reason, struct vchiq_header *header,
> +service_callback(enum vchiq_reason reason, struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
> {
> /* How do we ensure the callback goes to the right client?
> @@ -1666,7 +1666,7 @@ vchiq_compat_ioctl_queue_bulk(struct file *file,
> }
>
> struct vchiq_completion_data32 {
> - VCHIQ_REASON_T reason;
> + enum vchiq_reason reason;
> compat_uptr_t header;
> compat_uptr_t service_userdata;
> compat_uptr_t bulk_userdata;
> @@ -2271,7 +2271,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)
> }
>
> static VCHIQ_STATUS_T
> -vchiq_keepalive_vchiq_callback(VCHIQ_REASON_T reason,
> +vchiq_keepalive_vchiq_callback(enum vchiq_reason reason,
> struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T service_user,
> void *bulk_user)
> 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 56a23a2..b0e0653 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -355,7 +355,7 @@ mark_service_closing(struct vchiq_service *service)
> }
>
> static inline VCHIQ_STATUS_T
> -make_service_callback(struct vchiq_service *service, VCHIQ_REASON_T reason,
> +make_service_callback(struct vchiq_service *service, enum vchiq_reason reason,
> struct vchiq_header *header, void *bulk_userdata)
> {
> VCHIQ_STATUS_T status;
> @@ -1230,7 +1230,7 @@ notify_bulks(struct vchiq_service *service, struct vchiq_bulk_queue *queue,
> spin_unlock(&bulk_waiter_spinlock);
> } else if (bulk->mode ==
> VCHIQ_BULK_MODE_CALLBACK) {
> - VCHIQ_REASON_T reason = (bulk->dir ==
> + enum vchiq_reason reason = (bulk->dir ==
> VCHIQ_BULK_TRANSMIT) ?
> ((bulk->actual ==
> VCHIQ_BULK_ACTUAL_ABORTED) ?
> 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 c23bd10..f911612 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> @@ -15,7 +15,7 @@
> #define VCHIQ_GET_SERVICE_USERDATA(service) vchiq_get_service_userdata(service)
> #define VCHIQ_GET_SERVICE_FOURCC(service) vchiq_get_service_fourcc(service)
>
> -typedef enum {
> +enum vchiq_reason {
> VCHIQ_SERVICE_OPENED, /* service, -, - */
> VCHIQ_SERVICE_CLOSED, /* service, -, - */
> VCHIQ_MESSAGE_AVAILABLE, /* service, header, - */
> @@ -23,7 +23,7 @@ typedef enum {
> VCHIQ_BULK_RECEIVE_DONE, /* service, -, bulk_userdata */
> VCHIQ_BULK_TRANSMIT_ABORTED, /* service, -, bulk_userdata */
> VCHIQ_BULK_RECEIVE_ABORTED /* service, -, bulk_userdata */
> -} VCHIQ_REASON_T;
> +};
>
> typedef enum {
> VCHIQ_ERROR = -1,
> @@ -63,7 +63,7 @@ struct vchiq_element {
>
> typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
>
> -typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(VCHIQ_REASON_T,
> +typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
> struct vchiq_header *,
> VCHIQ_SERVICE_HANDLE_T, void *);
>
> 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 460ccea..c2343a1 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> @@ -32,7 +32,7 @@ struct vchiq_queue_bulk_transfer {
> };
>
> struct vchiq_completion_data {
> - VCHIQ_REASON_T reason;
> + enum vchiq_reason reason;
> struct vchiq_header *header;
> void *service_userdata;
> void *bulk_userdata;
> 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 a2268d5..e02518d 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> @@ -509,7 +509,7 @@ EXPORT_SYMBOL(vchi_disconnect);
> *
> ***********************************************************/
>
> -static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
> +static VCHIQ_STATUS_T shim_callback(enum vchiq_reason reason,
> struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T handle,
> void *bulk_user)
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@xxxxxxxxxxxxxxxx.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1570125797-24410-1-git-send-email-nachukannan%40gmail.com.
>
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
