1 files changed, 12 insertions, 21 deletions

diff --git a/src/core/ext/census/grpc_filter.cc b/src/core/ext/census/grpc_filter.cc
index b37ab90389..85f774b7d4 100644
--- a/src/core/ext/census/grpc_filter.cc
+++ b/src/core/ext/census/grpc_filter.cc
@@ -68,15 +68,13 @@ static void client_mutate_op(grpc_call_element *elem,
   }
 }
 
-static void client_start_transport_op(grpc_exec_ctx *exec_ctx,
-                                      grpc_call_element *elem,
+static void client_start_transport_op(grpc_call_element *elem,
                                       grpc_transport_stream_op_batch *op) {
   client_mutate_op(elem, op);
-  grpc_call_next_op(exec_ctx, elem, op);
+  grpc_call_next_op(elem, op);
 }
 
-static void server_on_done_recv(grpc_exec_ctx *exec_ctx, void *ptr,
-                                grpc_error *error) {
+static void server_on_done_recv(void *ptr, grpc_error *error) {
   GPR_TIMER_BEGIN("census-server:server_on_done_recv", 0);
   grpc_call_element *elem = (grpc_call_element *)ptr;
   call_data *calld = (call_data *)elem->call_data;
@@ -84,7 +82,7 @@ static void server_on_done_recv(grpc_exec_ctx *exec_ctx, void *ptr,
   if (error == GRPC_ERROR_NONE) {
     extract_and_annotate_method_tag(calld->recv_initial_metadata, calld, chand);
   }
-  calld->on_done_recv->cb(exec_ctx, calld->on_done_recv->cb_arg, error);
+  calld->on_done_recv->cb(calld->on_done_recv->cb_arg, error);
   GPR_TIMER_END("census-server:server_on_done_recv", 0);
 }
 
@@ -102,8 +100,7 @@ static void server_mutate_op(grpc_call_element *elem,
   }
 }
 
-static void server_start_transport_op(grpc_exec_ctx *exec_ctx,
-                                      grpc_call_element *elem,
+static void server_start_transport_op(grpc_call_element *elem,
                                       grpc_transport_stream_op_batch *op) {
   /* TODO(ctiller): this code fails. I don't know why. I expect it's
                     incomplete, and someone should look at it soon.
@@ -111,11 +108,10 @@ static void server_start_transport_op(grpc_exec_ctx *exec_ctx,
   call_data *calld = elem->call_data;
   GPR_ASSERT((calld->op_id.upper != 0) || (calld->op_id.lower != 0)); */
   server_mutate_op(elem, op);
-  grpc_call_next_op(exec_ctx, elem, op);
+  grpc_call_next_op(elem, op);
 }
 
-static grpc_error *client_init_call_elem(grpc_exec_ctx *exec_ctx,
-                                         grpc_call_element *elem,
+static grpc_error *client_init_call_elem(grpc_call_element *elem,
                                          const grpc_call_element_args *args) {
   call_data *d = (call_data *)elem->call_data;
   GPR_ASSERT(d != NULL);
@@ -124,8 +120,7 @@ static grpc_error *client_init_call_elem(grpc_exec_ctx *exec_ctx,
   return GRPC_ERROR_NONE;
 }
 
-static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx,
-                                     grpc_call_element *elem,
+static void client_destroy_call_elem(grpc_call_element *elem,
                                      const grpc_call_final_info *final_info,
                                      grpc_closure *ignored) {
   call_data *d = (call_data *)elem->call_data;
@@ -133,8 +128,7 @@ static void client_destroy_call_elem(grpc_exec_ctx *exec_ctx,
   /* TODO(hongyu): record rpc client stats and census_rpc_end_op here */
 }
 
-static grpc_error *server_init_call_elem(grpc_exec_ctx *exec_ctx,
-                                         grpc_call_element *elem,
+static grpc_error *server_init_call_elem(grpc_call_element *elem,
                                          const grpc_call_element_args *args) {
   call_data *d = (call_data *)elem->call_data;
   GPR_ASSERT(d != NULL);
@@ -146,8 +140,7 @@ static grpc_error *server_init_call_elem(grpc_exec_ctx *exec_ctx,
   return GRPC_ERROR_NONE;
 }
 
-static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx,
-                                     grpc_call_element *elem,
+static void server_destroy_call_elem(grpc_call_element *elem,
                                      const grpc_call_final_info *final_info,
                                      grpc_closure *ignored) {
   call_data *d = (call_data *)elem->call_data;
@@ -155,16 +148,14 @@ static void server_destroy_call_elem(grpc_exec_ctx *exec_ctx,
   /* TODO(hongyu): record rpc server stats and census_tracing_end_op here */
 }
 
-static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx,
-                                     grpc_channel_element *elem,
+static grpc_error *init_channel_elem(grpc_channel_element *elem,
                                      grpc_channel_element_args *args) {
   channel_data *chand = (channel_data *)elem->channel_data;
   GPR_ASSERT(chand != NULL);
   return GRPC_ERROR_NONE;
 }
 
-static void destroy_channel_elem(grpc_exec_ctx *exec_ctx,
-                                 grpc_channel_element *elem) {
+static void destroy_channel_elem(grpc_channel_element *elem) {
   channel_data *chand = (channel_data *)elem->channel_data;
   GPR_ASSERT(chand != NULL);
 }