[1/3] DSPBRIDGE: remove ntfy_init/exit functions

Commit Message

Guzman Lugo, Fernando March 25, 2010, 3:52 a.m. UTC

None

Patch

diff --git a/arch/arm/plat-omap/include/dspbridge/ntfy.h b/arch/arm/plat-omap/include/dspbridge/ntfy.h
index 11fa4b6..53f6cbd 100644
--- a/arch/arm/plat-omap/include/dspbridge/ntfy.h
+++ b/arch/arm/plat-omap/include/dspbridge/ntfy.h
@@ -31,7 +31,6 @@  struct ntfy_object;
  *      DSP_SOK:        Success.
  *      DSP_EMEMORY:    Memory allocation failure.
  *  Requires:
- *      ntfy_init(void) called.
  *      phNtfy != NULL.
  *  Ensures:
  *      DSP_SUCCEEDED(status) <==>  IS_VALID(*phNtfy).
@@ -46,36 +45,12 @@  extern dsp_status ntfy_create(OUT struct ntfy_object **phNtfy);
  *      ntfy_obj:  Handle returned from ntfy_create().
  *  Returns:
  *  Requires:
- *      ntfy_init(void) called.
  *      IS_VALID(ntfy_obj).
  *  Ensures:
  */
 extern void ntfy_delete(IN struct ntfy_object *ntfy_obj);
 
 /*
- *  ======== ntfy_exit ========
- *  Purpose:
- *      Discontinue usage of NTFY module.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      ntfy_init(void) successfully called before.
- *  Ensures:
- */
-extern void ntfy_exit(void);
-
-/*
- *  ======== ntfy_init ========
- *  Purpose:
- *      Initialize the NTFY module.
- *  Parameters:
- *  Returns:
- *      TRUE if initialization succeeded, FALSE otherwise.
- *  Ensures:
- */
-extern bool ntfy_init(void);
-
-/*
  *  ======== ntfy_notify ========
  *  Purpose:
  *      Execute notify function (signal event or post message) for every
@@ -86,7 +61,6 @@  extern bool ntfy_init(void);
  *      event_mask: The type of event that has occurred.
  *  Returns:
  *  Requires:
- *      ntfy_init(void) called.
  *      IS_VALID(ntfy_obj).
  *  Ensures:
  */
@@ -112,7 +86,6 @@  extern void ntfy_notify(IN struct ntfy_object *ntfy_obj, IN u32 event_mask);
  *      DSP_EHANDLE:        NULL hnotification, hnotification event name
  *                          too long, or hnotification event name NULL.
  *  Requires:
- *      ntfy_init(void) called.
  *      IS_VALID(ntfy_obj).
  *      hnotification != NULL.
  *      notify_type is DSP_SIGNALEVENT
diff --git a/drivers/dsp/bridge/services/ntfy.c b/drivers/dsp/bridge/services/ntfy.c
index b7da988..6d7d815 100644
--- a/drivers/dsp/bridge/services/ntfy.c
+++ b/drivers/dsp/bridge/services/ntfy.c
@@ -132,26 +132,6 @@  void ntfy_delete(struct ntfy_object *ntfy_obj)
 }
 
 /*
- *  ======== ntfy_exit ========
- *  Purpose:
- *      Discontinue usage of NTFY module.
- */
-void ntfy_exit(void)
-{
-	/* Do nothing */
-}
-
-/*
- *  ======== ntfy_init ========
- *  Purpose:
- *      Initialize the NTFY module.
- */
-bool ntfy_init(void)
-{
-	return true;
-}
-
-/*
  *  ======== ntfy_notify ========
  *  Purpose:
  *      Execute notify function (signal event) for every
diff --git a/drivers/dsp/bridge/services/services.c b/drivers/dsp/bridge/services/services.c
index ccc4e93..df3de5f 100644
--- a/drivers/dsp/bridge/services/services.c
+++ b/drivers/dsp/bridge/services/services.c
@@ -45,7 +45,6 @@ 
 void services_exit(void)
 {
 	/* Uninitialize all SERVICES modules here */
-	ntfy_exit();
 	clk_exit();
 	reg_exit();
 	cfg_exit();
@@ -61,20 +60,17 @@  bool services_init(void)
 {
 	bool ret = true;
 	bool fcfg, fmem;
-	bool freg, fclk, fntfy;
+	bool freg, fclk;
 
 	/* Perform required initialization of SERVICES modules. */
 	fmem = services_mem_init();
 	freg = reg_init();
 	fcfg = cfg_init();
 	fclk = services_clk_init();
-	fntfy = ntfy_init();
 
 	ret = fcfg && fmem && freg && fclk;
 
 	if (!ret) {
-		if (fntfy)
-			ntfy_exit();
 
 		if (fclk)
 			clk_exit();