Commit 051fbf47 authored by Jamal Shareef's avatar Jamal Shareef Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Replace VCHIQ_CONNSTATE_T enum typedef with enum vchiq_connstate 



Replaces VCHIQ_CONNSTATE_T enum typedef with enum vchiq_connstate to
match kernel code style. Issue found by checkpatch.

Signed-off-by: default avatarJamal Shareef <jamal.k.shareef@gmail.com>
Link: https://lore.kernel.org/r/7e64765a55193413e9668dc53f751c435369ed80.1572994235.git.jamal.k.shareef@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27c53ee8

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+2 −2
Original line number Diff line number Diff line
@@ -3128,8 +3128,8 @@ void vchiq_on_remote_use_active(struct vchiq_state *state) 
}



void vchiq_platform_conn_state_changed(struct vchiq_state *state,

				       VCHIQ_CONNSTATE_T oldstate,

				       VCHIQ_CONNSTATE_T newstate)

				       enum vchiq_connstate oldstate,

				       enum vchiq_connstate newstate)

{

	struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+3 −3
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ make_service_callback(struct vchiq_service *service, enum vchiq_reason reason, 
}



inline void

vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate)

vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate)

{

	VCHIQ_CONNSTATE_T oldstate = state->conn_state;

	enum vchiq_connstate oldstate = state->conn_state;



	vchiq_log_info(vchiq_core_log_level, "%d: %s->%s", state->id,

		conn_state_names[oldstate],
@@ -2078,7 +2078,7 @@ init_bulk_queue(struct vchiq_bulk_queue *queue) 
}



inline const char *

get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)

get_conn_state_name(enum vchiq_connstate conn_state)

{

	return conn_state_names[conn_state];

}

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+7 −7
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ enum { 


#endif /* VCHIQ_ENABLE_DEBUG */



typedef enum {

enum vchiq_connstate {

	VCHIQ_CONNSTATE_DISCONNECTED,

	VCHIQ_CONNSTATE_CONNECTING,

	VCHIQ_CONNSTATE_CONNECTED,
@@ -179,7 +179,7 @@ typedef enum { 
	VCHIQ_CONNSTATE_RESUMING,

	VCHIQ_CONNSTATE_PAUSE_TIMEOUT,

	VCHIQ_CONNSTATE_RESUME_TIMEOUT

} VCHIQ_CONNSTATE_T;

};



enum {

	VCHIQ_SRVSTATE_FREE,
@@ -367,7 +367,7 @@ struct vchiq_slot_zero { 
struct vchiq_state {

	int id;

	int initialised;

	VCHIQ_CONNSTATE_T conn_state;

	enum vchiq_connstate conn_state;

	short version_common;



	struct vchiq_shared_state *local;
@@ -486,7 +486,7 @@ extern int vchiq_sync_log_level; 
extern struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];



extern const char *

get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);

get_conn_state_name(enum vchiq_connstate conn_state);



extern struct vchiq_slot_zero *

vchiq_init_slots(void *mem_base, int mem_size);
@@ -644,14 +644,14 @@ vchiq_send_remote_use_active(struct vchiq_state *state); 


extern void

vchiq_platform_conn_state_changed(struct vchiq_state *state,

				  VCHIQ_CONNSTATE_T oldstate,

				  VCHIQ_CONNSTATE_T newstate);

				  enum vchiq_connstate oldstate,

				  enum vchiq_connstate newstate);



extern void

vchiq_platform_handle_timeout(struct vchiq_state *state);



extern void

vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate);

vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate);



extern void

vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,

CRA Git | Maintained and supported by SUSTech CRA and CCSE