Revert "Add timer delete support to rild" DO NOT MERGE

This reverts commit 7edd07c9184a3abfaa3f4a161b74b3da9d7bbd56.
We need to revert here as this change is not in Gingerbread
or later branches.

Change-Id: I1b0d68655e3a91647f455cbc43f421db39f9aa55

1 files changed, 3 insertions, 16 deletions

diff --git a/include/telephony/ril.h b/include/telephony/ril.h
index 82d2ca3..4bd9442 100644
--- a/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@ -3481,14 +3481,8 @@ struct RIL_Env {
      * soon as possible
      */
 
-    void* (*RequestTimedCallback) (RIL_TimedCallback callback,
+    void (*RequestTimedCallback) (RIL_TimedCallback callback,
                                    void *param, const struct timeval *relativeTime);
-
-
-    /**
-     * Remove user-specified callback function
-     */
-    void (*RemoveTimedCallback) (void *callbackInfo);
 };
 
 
@@ -3552,15 +3546,8 @@ void RIL_onUnsolicitedResponse(int unsolResponse, const void *data,
  * @param relativeTime a relative time value at which the callback is invoked
  */
 
-void* RIL_requestTimedCallback (RIL_TimedCallback callback,
-                                void *param, const struct timeval *relativeTime);
-
-/**
- * Remove user-specified callback function
- *  @param callbackInfo  Pointer returned to the caller when timer was scheduled
- */
-
-void RIL_removeTimedCallback(void *callbackInfo);
+void RIL_requestTimedCallback (RIL_TimedCallback callback,
+                               void *param, const struct timeval *relativeTime);
 
 
 #endif /* RIL_SHLIB */