lkml.org 
[lkml]   [2012]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/17] staging: tidspbridge: remove dev_init() and dev_exit()
    Date
    The dev module has a dev_init() and a dev_exit() whose only purpose is
    to keep a reference counting which is not used at all.

    This patch removes these functions and the reference count variable.

    There is no functional changes.

    Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
    ---
    .../staging/tidspbridge/include/dspbridge/dev.h | 27 ------------------
    drivers/staging/tidspbridge/pmgr/dev.c | 29 --------------------
    drivers/staging/tidspbridge/pmgr/dspapi.c | 22 ++-------------
    3 files changed, 3 insertions(+), 75 deletions(-)

    diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
    index f92b4be..fa2d79e 100644
    --- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
    +++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
    @@ -478,33 +478,6 @@ extern int dev_get_bridge_context(struct dev_object *hdev_obj,
    **phbridge_context);

    /*
    - * ======== dev_exit ========
    - * Purpose:
    - * Decrement reference count, and free resources when reference count is
    - * 0.
    - * Parameters:
    - * Returns:
    - * Requires:
    - * DEV is initialized.
    - * Ensures:
    - * When reference count == 0, DEV's private resources are freed.
    - */
    -extern void dev_exit(void);
    -
    -/*
    - * ======== dev_init ========
    - * Purpose:
    - * Initialize DEV's private state, keeping a reference count on each call.
    - * Parameters:
    - * Returns:
    - * TRUE if initialized; FALSE if error occurred.
    - * Requires:
    - * Ensures:
    - * TRUE: A requirement for the other public DEV functions.
    - */
    -extern bool dev_init(void);
    -
    -/*
    * ======== dev_insert_proc_object ========
    * Purpose:
    * Inserts the Processor Object into the List of PROC Objects
    diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
    index c5e627c..6234ffb 100644
    --- a/drivers/staging/tidspbridge/pmgr/dev.c
    +++ b/drivers/staging/tidspbridge/pmgr/dev.c
    @@ -81,9 +81,6 @@ struct drv_ext {
    char sz_string[MAXREGPATHLENGTH];
    };

    -/* ----------------------------------- Globals */
    -static u32 refs; /* Module reference count */
    -
    /* ----------------------------------- Function Prototypes */
    static int fxn_not_implemented(int arg, ...);
    static int init_cod_mgr(struct dev_object *dev_obj);
    @@ -649,32 +646,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
    }

    /*
    - * ======== dev_exit ========
    - * Purpose:
    - * Decrement reference count, and free resources when reference count is
    - * 0.
    - */
    -void dev_exit(void)
    -{
    - refs--;
    -}
    -
    -/*
    - * ======== dev_init ========
    - * Purpose:
    - * Initialize DEV's private state, keeping a reference count on each call.
    - */
    -bool dev_init(void)
    -{
    - bool ret = true;
    -
    - if (ret)
    - refs++;
    -
    - return ret;
    -}
    -
    -/*
    * ======== dev_notify_clients ========
    * Purpose:
    * Notify all clients of this device of a change in device status.
    diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
    index b9ca24c..9ef1ad9 100644
    --- a/drivers/staging/tidspbridge/pmgr/dspapi.c
    +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
    @@ -265,11 +265,8 @@ void api_exit(void)
    {
    api_c_refs--;

    - if (api_c_refs == 0) {
    - /* Release all modules initialized in api_init(). */
    - dev_exit();
    + if (api_c_refs == 0)
    mgr_exit();
    - }
    }

    /*
    @@ -280,23 +277,10 @@ void api_exit(void)
    bool api_init(void)
    {
    bool ret = true;
    - bool fdev;
    - bool fmgr;
    -
    - if (api_c_refs == 0) {
    - /* initialize driver and other modules */
    - fmgr = mgr_init();
    - fdev = dev_init();
    - ret = fdev && fmgr;
    - if (!ret) {

    - if (fmgr)
    - mgr_exit();
    + if (api_c_refs == 0)
    + ret = mgr_init();

    - if (fdev)
    - dev_exit();
    - }
    - }
    if (ret)
    api_c_refs++;

    --
    1.7.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-03-09 01:09    [W:0.028 / U:0.632 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site