vc04_services: Fixing coding and logical guidelines
Subsystems (2)
PATCH 1/1 vc04_services: Fixing coding and logical guidelines
Description:
in file 'vc04_services/interface/vchiq_arm/vchiq_shim.c', making changes to make code according to 'checkpath.pl'.
Also, fixing logical issue, i.e. removing break after goto statement.
--- .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 33 ++++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +24 -9
@@ -52,7 +52,8 @@ typedef struct {/* ---------------------------------------------------------------------- * return pointer to the mphi message driver function table -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ const VCHI_MESSAGE_DRIVER_T *vchi_mphi_message_driver_func_table (void ) {
@@ -61,7 +62,8 @@ vchi_mphi_message_driver_func_table(void)/* ---------------------------------------------------------------------- * return a pointer to the 'single' connection driver fops -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ const VCHI_CONNECTION_API_T *single_get_func_table (void ) {
@@ -556,6 +558,7 @@ EXPORT_SYMBOL(vchi_connect);int32_t vchi_disconnect (VCHI_INSTANCE_T instance_handle) {VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T )instance_handle; +return vchiq_status_to_vchi (vchiq_shutdown (instance)); }EXPORT_SYMBOL (vchi_disconnect);
@@ -592,7 +595,6 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason, VCHI_CALLBACK_MSG_AVAILABLE, NULL); goto done; -break ;case VCHIQ_BULK_TRANSMIT_DONE : service->callback(service->callback_param,
@@ -733,8 +735,10 @@ int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +if (service) {VCHIQ_STATUS_T status =vchiq_close_service (service->handle); +if (status ==VCHIQ_SUCCESS ) {service_free (service); service =NULL ;
@@ -750,8 +754,10 @@ int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +if (service) {VCHIQ_STATUS_T status =vchiq_remove_service (service->handle); +if (status ==VCHIQ_SUCCESS ) {service_free (service); service =NULL ;
@@ -770,6 +776,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle;VCHIQ_SERVICE_OPTION_T vchiq_option; +switch (option) {case VCHI_SERVICE_OPTION_TRACE : vchiq_option =VCHIQ_SERVICE_OPTION_TRACE ;
@@ -797,8 +804,8 @@ int32_t vchi_get_peer_version(const VCHI_SERVICE_HANDLE_T handle, short *peer_ve {int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; -if (service) - { + +if (service) {VCHIQ_STATUS_T status; status =vchiq_get_peer_version (service->handle, peer_version);
@@ -811,7 +818,8 @@ EXPORT_SYMBOL(vchi_get_peer_version);/* ---------------------------------------------------------------------- * read a uint32_t from buffer. * network format is defined to be little endian -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ uint32_t vchi_readbuf_uint32 (const void *_ptr) {
@@ -822,11 +830,13 @@ vchi_readbuf_uint32(const void *_ptr)/* ---------------------------------------------------------------------- * write a uint32_t to buffer. * network format is defined to be little endian -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ void vchi_writebuf_uint32 (void *_ptr,uint32_t value) {unsigned char *ptr = _ptr; + ptr[0 ] = (unsigned char )((value >>0 ) &0xFF ); ptr[1 ] = (unsigned char )((value >>8 ) &0xFF ); ptr[2 ] = (unsigned char )((value >>16 ) &0xFF );
@@ -836,7 +846,8 @@ vchi_writebuf_uint32(void *_ptr, uint32_t value)/* ---------------------------------------------------------------------- * read a uint16_t from buffer. * network format is defined to be little endian -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ uint16_t vchi_readbuf_uint16 (const void *_ptr) {
@@ -847,11 +858,13 @@ vchi_readbuf_uint16(const void *_ptr)/* ---------------------------------------------------------------------- * write a uint16_t into the buffer. * network format is defined to be little endian -* -------------------------------------------------------------------- */ +* ---------------------------------------------------------------------- +*/ void vchi_writebuf_uint16 (void *_ptr,uint16_t value) {unsigned char *ptr = _ptr; + ptr[0 ] = (value >>0 ) &0xFF ; ptr[1 ] = (value >>8 ) &0xFF ; }
@@ -870,6 +883,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +if (service) ret =vchiq_status_to_vchi (vchiq_use_service (service->handle));return ret;
@@ -890,6 +904,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ;SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +if (service) ret =vchiq_status_to_vchi (vchiq_release_service (service->handle));
Signature · 1 line
2.7.4
Greg Kroah-Hartman
maintainerQuoted 1 line · Pushkar Jambhlekar
Description:
No need for that line.
Quoted 1 line
in file '
vc04_services/interface/vchiq_arm/vchiq_shim.c', making changes to make code according to 'checkpath.pl'.
Why indent? Also, you need to be specific as to what type of changes you made.
Quoted 1 line
Also, fixing logical issue, i.e. removing break after goto statement.
Don't do multiple things in the same patch, break it up into one-patch-per-thing, and no, "checkpatch.pl cleanups" is not "one thing" :)
thanks,
greg k-h
Thanks. I will rewrite patch according to the suggestions.
Quoted 19 lines · Greg Kroah-Hartman
Quoted 1 line · Pushkar Jambhlekar
Description:
No need for that line.
Quoted 1 line
in file '
vc04_services/interface/vchiq_arm/vchiq_shim.c', making changes to make code according to 'checkpath.pl'.Why indent? Also, you need to be specific as to what type of changes you made.
Quoted 1 line
Also, fixing logical issue, i.e. removing break after goto statement.
Don't do multiple things in the same patch, break it up into one-patch-per-thing, and no, "checkpatch.pl cleanups" is not "one thing" :)
thanks,
greg k-h
Signature · 2 lines
Jambhlekar Pushkar Arun M.Tech IIT Roorkee