Commit 5242d232 authored by Ramesh Gupta's avatar Ramesh Gupta Committed by Hari Kanigeri

checkpatch fix for tesla driver checkpatch fix for tesla driver

Signed-off-by: default avatarRamesh Gupta G <grgupta@ti.com>
parent 858f1dec
...@@ -47,7 +47,7 @@ static void __exit drvtesla_finalize_module(void) ; ...@@ -47,7 +47,7 @@ static void __exit drvtesla_finalize_module(void) ;
/* Function to invoke the APIs through ioctl. */ /* Function to invoke the APIs through ioctl. */
static struct file_operations driver_ops = { static const struct file_operations driver_ops = {
.open = drvtesla_open, .open = drvtesla_open,
}; };
......
...@@ -109,7 +109,7 @@ static struct notify_tesladrv_module notify_tesladriver_state = { ...@@ -109,7 +109,7 @@ static struct notify_tesladrv_module notify_tesladriver_state = {
void notify_tesladrv_isr(void *ref_data); static void notify_tesladrv_isr(void *ref_data);
...@@ -159,7 +159,8 @@ int notify_tesladrv_open(char *driver_name, ...@@ -159,7 +159,8 @@ int notify_tesladrv_open(char *driver_name,
BUG_ON(driver_name == NULL); BUG_ON(driver_name == NULL);
BUG_ON(handle_ptr == NULL); BUG_ON(handle_ptr == NULL);
/* Enter critical section protection. */ /* Enter critical section protection. */
WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle) != 0); WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle)
!= 0);
/* Get the handle from Notify module. */ /* Get the handle from Notify module. */
status = notify_get_driver_handle(driver_name, handle_ptr); status = notify_get_driver_handle(driver_name, handle_ptr);
if (status < 0) if (status < 0)
...@@ -201,7 +202,8 @@ void notify_tesladrv_params_init(struct notify_driver_object *handle, ...@@ -201,7 +202,8 @@ void notify_tesladrv_params_init(struct notify_driver_object *handle,
&(notify_tesladriver_state.def_inst_params), &(notify_tesladriver_state.def_inst_params),
sizeof(struct notify_tesladrv_params)); sizeof(struct notify_tesladrv_params));
} else { } else {
/* Return updated NotifyDriverShm instance specific parameters. */ /* Return updated NotifyDriverShm instance
specific parameters. */
driver_obj = (struct notify_tesladrv_object *) driver_obj = (struct notify_tesladrv_object *)
handle->driver_object; handle->driver_object;
memcpy(params, &(driver_obj->params), memcpy(params, &(driver_obj->params),
...@@ -259,25 +261,34 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name, ...@@ -259,25 +261,34 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name,
params->remote_proc_id; params->remote_proc_id;
/* Function table information */ /* Function table information */
fxn_table.register_event = (void*)&notify_tesladrv_register_event; fxn_table.register_event = (void *)
fxn_table.unregister_event = (void*)&notify_tesladrv_unregister_event; &notify_tesladrv_register_event;
fxn_table.send_event = (void*)&notify_tesladrv_sendevent; fxn_table.unregister_event = (void *)
fxn_table.disable = (void*)&notify_tesladrv_disable; &notify_tesladrv_unregister_event;
fxn_table.restore = (void*)&notify_tesladrv_restore; fxn_table.send_event = (void *)&notify_tesladrv_sendevent;
fxn_table.disable_event = (void*)&notify_tesladrv_disable_event; fxn_table.disable = (void *)&notify_tesladrv_disable;
fxn_table.enable_event = (void*)&notify_tesladrv_enable_event; fxn_table.restore = (void *)&notify_tesladrv_restore;
fxn_table.disable_event = (void *)
&notify_tesladrv_disable_event;
fxn_table.enable_event = (void *)&notify_tesladrv_enable_event;
status = notify_register_driver(driver_name, status = notify_register_driver(driver_name,
&fxn_table, &drv_attrs, &drv_handle); &fxn_table,
&drv_attrs,
&drv_handle);
if (status != NOTIFY_SUCCESS) { if (status != NOTIFY_SUCCESS) {
/*! @retval NULL Failed to register driver with Notify module!*/ /*retval NULL Failed to register
pr_err("notify_register_driver failed and status = %d\n", status); driver with Notify module*/
printk(KERN_ERR "notify_register_driver"
" failed and status = %d\n",
status);
status = -EINVAL; status = -EINVAL;
goto func_end; goto func_end;
} else { } else {
/* Allocate memory for the NotifyDriverShm_Object object. */ /* Allocate memory for the
NotifyDriverShm_Object object. */
drv_handle->driver_object = driver_obj = drv_handle->driver_object = driver_obj =
kmalloc(sizeof(struct notify_tesladrv_object), kmalloc(sizeof(struct notify_tesladrv_object),
GFP_ATOMIC); GFP_ATOMIC);
...@@ -296,7 +307,8 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name, ...@@ -296,7 +307,8 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name,
/*FIXME: Check with MultiProc_getId */ /*FIXME: Check with MultiProc_getId */
driver_obj->self_id = 1; driver_obj->self_id = 1;
driver_obj->other_id = 0; driver_obj->other_id = 0;
driver_obj->ctrl_ptr = (struct notify_shmdrv_ctrl *) params->shared_addr; driver_obj->ctrl_ptr = (struct notify_shmdrv_ctrl *)
params->shared_addr;
ctrl_ptr = &(driver_obj->ctrl_ptr->proc_ctrl[driver_obj->self_id]); ctrl_ptr = &(driver_obj->ctrl_ptr->proc_ctrl[driver_obj->self_id]);
...@@ -304,16 +316,18 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name, ...@@ -304,16 +316,18 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name,
ctrl_ptr->self_event_chart = (struct notify_shmdrv_event_entry *) ctrl_ptr->self_event_chart = (struct notify_shmdrv_event_entry *)
((int)(driver_obj->ctrl_ptr) ((int)(driver_obj->ctrl_ptr)
+ sizeof(struct notify_shmdrv_ctrl) + sizeof(struct notify_shmdrv_ctrl)+
+(sizeof(struct notify_shmdrv_event_entry) (sizeof(
struct notify_shmdrv_event_entry)
* params->num_events * params->num_events
* driver_obj->other_id)); * driver_obj->other_id));
ctrl_ptr->other_event_chart = (struct notify_shmdrv_event_entry *) ctrl_ptr->other_event_chart = (struct notify_shmdrv_event_entry *)
((int)(driver_obj->ctrl_ptr) ((int)(driver_obj->ctrl_ptr)
+ sizeof(struct notify_shmdrv_ctrl) + sizeof(struct notify_shmdrv_ctrl) +
+(sizeof(struct notify_shmdrv_event_entry) (sizeof(
struct notify_shmdrv_event_entry)
* params->num_events * params->num_events
* driver_obj->self_id)); * driver_obj->self_id));
...@@ -342,8 +356,9 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name, ...@@ -342,8 +356,9 @@ struct notify_driver_object *notify_tesladrv_create(char *driver_name,
status = -ENOMEM; status = -ENOMEM;
goto func_end; goto func_end;
} else { } else {
memset(driver_obj->reg_chart, 0, sizeof(struct notify_shmdrv_eventreg) memset(driver_obj->reg_chart, 0,
*params->num_events); sizeof(struct notify_shmdrv_eventreg)
*params->num_events);
} }
...@@ -437,7 +452,8 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr) ...@@ -437,7 +452,8 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr)
WARN_ON(handlePtr == NULL); WARN_ON(handlePtr == NULL);
if (handlePtr == NULL) if (handlePtr == NULL)
return -1; return -1;
driver_obj = (struct notify_tesladrv_object *)(*handlePtr)->driver_object; driver_obj = (struct notify_tesladrv_object *)
(*handlePtr)->driver_object;
drv_handle = (*handlePtr); drv_handle = (*handlePtr);
WARN_ON((*handlePtr)->driver_object == NULL); WARN_ON((*handlePtr)->driver_object == NULL);
...@@ -456,10 +472,12 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr) ...@@ -456,10 +472,12 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr)
if (driver_obj != NULL) { if (driver_obj != NULL) {
if (driver_obj->ctrl_ptr != NULL) { if (driver_obj->ctrl_ptr != NULL) {
/* Clear initialization status in shared memory. */ /* Clear initialization status in shared memory. */
driver_obj->ctrl_ptr->proc_ctrl[driver_obj->self_id].recv_init_status = driver_obj->ctrl_ptr->
0x0; proc_ctrl[driver_obj->self_id].
driver_obj->ctrl_ptr->proc_ctrl[driver_obj->self_id].send_init_status = recv_init_status = 0x0;
0x0; driver_obj->ctrl_ptr->
proc_ctrl[driver_obj->self_id].
send_init_status = 0x0;
driver_obj->ctrl_ptr = NULL; driver_obj->ctrl_ptr = NULL;
} }
...@@ -469,7 +487,8 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr) ...@@ -469,7 +487,8 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr)
for (i = 0 ; i < driver_obj->params.num_events ; i++) { for (i = 0 ; i < driver_obj->params.num_events ; i++) {
WARN_ON(event_list[i].event_handler_count != 0); WARN_ON(event_list[i].event_handler_count != 0);
event_list[i].event_handler_count = 0; event_list[i].event_handler_count = 0;
list_del((struct list_head *)&event_list[i].listeners); list_del((struct list_head *)
&event_list[i].listeners);
} }
kfree(event_list); kfree(event_list);
...@@ -502,7 +521,6 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr) ...@@ -502,7 +521,6 @@ int notify_tesladrv_delete(struct notify_driver_object **handlePtr)
} }
return status; return status;
} }
EXPORT_SYMBOL(notify_tesladrv_delete); EXPORT_SYMBOL(notify_tesladrv_delete);
...@@ -518,9 +536,8 @@ int notify_tesladrv_destroy(void) ...@@ -518,9 +536,8 @@ int notify_tesladrv_destroy(void)
/* Check if the gate_handle was created internally. */ /* Check if the gate_handle was created internally. */
if (notify_tesladriver_state.cfg.gate_handle == NULL) { if (notify_tesladriver_state.cfg.gate_handle == NULL) {
if (notify_tesladriver_state.gate_handle != NULL) { if (notify_tesladriver_state.gate_handle != NULL)
kfree(notify_tesladriver_state.gate_handle); kfree(notify_tesladriver_state.gate_handle);
}
} }
notify_tesladriver_state.is_setup = false; notify_tesladriver_state.is_setup = false;
return status; return status;
...@@ -558,7 +575,8 @@ int notify_tesladrv_setup(struct notify_tesladrv_config *cfg) ...@@ -558,7 +575,8 @@ int notify_tesladrv_setup(struct notify_tesladrv_config *cfg)
if (cfg->gate_handle != NULL) if (cfg->gate_handle != NULL)
notify_tesladriver_state.gate_handle = cfg->gate_handle; notify_tesladriver_state.gate_handle = cfg->gate_handle;
else { else {
notify_tesladriver_state.gate_handle = kmalloc(sizeof(struct mutex), notify_tesladriver_state.gate_handle =
kmalloc(sizeof(struct mutex),
GFP_KERNEL); GFP_KERNEL);
mutex_init(notify_tesladriver_state.gate_handle); mutex_init(notify_tesladriver_state.gate_handle);
} }
...@@ -610,13 +628,15 @@ int notify_tesladrv_register_event( ...@@ -610,13 +628,15 @@ int notify_tesladrv_register_event(
ctrl_ptr = driver_object->ctrl_ptr; ctrl_ptr = driver_object->ctrl_ptr;
/* Allocate memory for event listener. */ /* Allocate memory for event listener. */
event_listener = kmalloc(sizeof(struct notify_drv_eventlistner), GFP_ATOMIC); event_listener = kmalloc(sizeof(struct notify_drv_eventlistner),
GFP_ATOMIC);
if (event_listener == NULL) { if (event_listener == NULL) {
status = -ENOMEM; status = -ENOMEM;
goto func_end; goto func_end;
} else { } else {
memset(event_listener, 0, sizeof(struct notify_drv_eventlistner)); memset(event_listener, 0,
sizeof(struct notify_drv_eventlistner));
} }
if (mutex_lock_interruptible(notify_tesladriver_state.gate_handle) != 0) if (mutex_lock_interruptible(notify_tesladriver_state.gate_handle) != 0)
...@@ -651,9 +671,11 @@ int notify_tesladrv_register_event( ...@@ -651,9 +671,11 @@ int notify_tesladrv_register_event(
/* Find the correct slot in the registration array. */ /* Find the correct slot in the registration array. */
if (reg_chart[i].reg_event_no == (int) -1) { if (reg_chart[i].reg_event_no == (int) -1) {
for (j = (i - 1); j >= 0; j--) { for (j = (i - 1); j >= 0; j--) {
if (event_no < reg_chart[j].reg_event_no) { if (event_no < reg_chart[j].
reg_event_no) {
reg_chart[j + 1].reg_event_no = reg_chart[j + 1].reg_event_no =
reg_chart[j].reg_event_no; reg_chart[j].
reg_event_no;
reg_chart[j + 1].reserved = reg_chart[j + 1].reserved =
reg_chart[j].reserved; reg_chart[j].reserved;
i = j; i = j;
...@@ -769,7 +791,8 @@ int notify_tesladrv_unregister_event( ...@@ -769,7 +791,8 @@ int notify_tesladrv_unregister_event(
reg_chart[j].reserved; reg_chart[j].reserved;
} }
if (j == num_events) { if (j == num_events) {
reg_chart[j - 1].reg_event_no = (int) -1; reg_chart[j - 1].reg_event_no =
(int) -1;
} }
break; break;
...@@ -777,8 +800,6 @@ int notify_tesladrv_unregister_event( ...@@ -777,8 +800,6 @@ int notify_tesladrv_unregister_event(
} }
} }
func_end: func_end:
mutex_unlock(notify_tesladriver_state.gate_handle); mutex_unlock(notify_tesladriver_state.gate_handle);
return status; return status;
...@@ -794,7 +815,7 @@ int notify_tesladrv_sendevent(struct notify_driver_object *handle, ...@@ -794,7 +815,7 @@ int notify_tesladrv_sendevent(struct notify_driver_object *handle,
int payload, short int wait_clear) int payload, short int wait_clear)
{ {
int status = 0; int status = 0;
struct notify_tesladrv_object*driver_object; struct notify_tesladrv_object *driver_object;
struct notify_shmdrv_ctrl *ctrl_ptr; struct notify_shmdrv_ctrl *ctrl_ptr;
int max_poll_count; int max_poll_count;
...@@ -867,7 +888,8 @@ int notify_tesladrv_disable_event( ...@@ -867,7 +888,8 @@ int notify_tesladrv_disable_event(
driver_object = (struct notify_tesladrv_object *) handle->driver_object; driver_object = (struct notify_tesladrv_object *) handle->driver_object;
/* Enter critical section protection. */ /* Enter critical section protection. */
WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle) != 0); WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle)
!= 0);
CLEAR_BIT(driver_object->ctrl_ptr->proc_ctrl[driver_object->self_id]. CLEAR_BIT(driver_object->ctrl_ptr->proc_ctrl[driver_object->self_id].
reg_mask.enable_mask, event_no); reg_mask.enable_mask, event_no);
/* Leave critical section protection. */ /* Leave critical section protection. */
...@@ -890,7 +912,8 @@ int notify_tesladrv_enable_event(struct notify_driver_object *handle, ...@@ -890,7 +912,8 @@ int notify_tesladrv_enable_event(struct notify_driver_object *handle,
driver_object = (struct notify_tesladrv_object *) handle->driver_object; driver_object = (struct notify_tesladrv_object *) handle->driver_object;
/* Enter critical section protection. */ /* Enter critical section protection. */
WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle) != 0); WARN_ON(mutex_lock_interruptible(notify_tesladriver_state.gate_handle)
!= 0);
SET_BIT(driver_object->ctrl_ptr->proc_ctrl[driver_object->self_id]. SET_BIT(driver_object->ctrl_ptr->proc_ctrl[driver_object->self_id].
reg_mask.enable_mask, event_no); reg_mask.enable_mask, event_no);
...@@ -914,7 +937,7 @@ int notify_tesladrv_debug(struct notify_driver_object *handle) ...@@ -914,7 +937,7 @@ int notify_tesladrv_debug(struct notify_driver_object *handle)
* interrupt received from the DSP. * interrupt received from the DSP.
* *
*/ */
void notify_tesladrv_isr(void *ref_data) static void notify_tesladrv_isr(void *ref_data)
{ {
int payload = 0; int payload = 0;
int i = 0; int i = 0;
...@@ -944,7 +967,8 @@ void notify_tesladrv_isr(void *ref_data) ...@@ -944,7 +967,8 @@ void notify_tesladrv_isr(void *ref_data)
do { do {
event_no = reg_chart[i].reg_event_no; event_no = reg_chart[i].reg_event_no;
if (event_no != (unsigned long int) -1) { if (event_no != (unsigned long int) -1) {
if (TEST_BIT(ctrl_ptr->reg_mask.enable_mask, event_no) == 1) { if (TEST_BIT(ctrl_ptr->reg_mask.enable_mask,
event_no) == 1) {
mbx_ret_val = ntfy_disp_read(mbox_module_no, mbx_ret_val = ntfy_disp_read(mbox_module_no,
NOTIFYDRV_TESLA_RECV_MBX, NOTIFYDRV_TESLA_RECV_MBX,
&payload, &payload,
...@@ -954,7 +978,8 @@ void notify_tesladrv_isr(void *ref_data) ...@@ -954,7 +978,8 @@ void notify_tesladrv_isr(void *ref_data)
listeners.next; listeners.next;
for (j = 0; j < for (j = 0; j <
drv_object->event_list[event_no]. drv_object->
event_list[event_no].
event_handler_count; j++) { event_handler_count; j++) {
if (temp > (struct list_head *)0) { if (temp > (struct list_head *)0) {
((struct ((struct
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment