lkml.org 
[lkml]   [2012]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/11] ubi: fastmap: Remove 'ubi' parameter of 'destroy_ai()'
    Date
    From: Shmulik Ladkani <shmulik.ladkani@gmail.com>

    The 'ubi' argument of 'destroy_ai' was added during fastmap development,
    but it is no longer used.

    Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    ---
    drivers/mtd/ubi/attach.c | 15 +++++++--------
    1 files changed, 7 insertions(+), 8 deletions(-)

    diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c
    index bc1e4bf..c30a0f6 100644
    --- a/drivers/mtd/ubi/attach.c
    +++ b/drivers/mtd/ubi/attach.c
    @@ -1164,10 +1164,9 @@ static void destroy_av(struct ubi_attach_info *ai, struct ubi_ainf_volume *av)

    /**
    * destroy_ai - destroy attaching information.
    - * @ubi: UBI device object
    * @ai: attaching information
    */
    -static void destroy_ai(struct ubi_device *ubi, struct ubi_attach_info *ai)
    +static void destroy_ai(struct ubi_attach_info *ai)
    {
    struct ubi_ainf_peb *aeb, *aeb_tmp;
    struct ubi_ainf_volume *av;
    @@ -1300,7 +1299,7 @@ out_vidh:
    out_ech:
    kfree(ech);
    out_ai:
    - destroy_ai(ubi, ai);
    + destroy_ai(ai);
    return err;
    }

    @@ -1353,7 +1352,7 @@ out_vidh:
    out_ech:
    kfree(ech);
    out_ai:
    - destroy_ai(ubi, ai);
    + destroy_ai(ai);
    return err;
    }
    static struct ubi_attach_info *alloc_ai(void)
    @@ -1403,7 +1402,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
    err = scan_fast(ubi, ai);
    if (err > 0) {
    if (err != UBI_NO_FASTMAP) {
    - destroy_ai(ubi, ai);
    + destroy_ai(ai);
    ai = alloc_ai();
    if (!ai)
    return -ENOMEM;
    @@ -1449,13 +1448,13 @@ int ubi_attach(struct ubi_device *ubi, int force_scan)
    }

    err = self_check_eba(ubi, ai, scan_ai);
    - destroy_ai(ubi, scan_ai);
    + destroy_ai(scan_ai);

    if (err)
    goto out_wl;
    }

    - destroy_ai(ubi, ai);
    + destroy_ai(ai);
    return 0;

    out_wl:
    @@ -1464,7 +1463,7 @@ out_vtbl:
    ubi_free_internal_volumes(ubi);
    vfree(ubi->vtbl);
    out_ai:
    - destroy_ai(ubi, ai);
    + destroy_ai(ai);
    return err;
    }

    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-06-29 19:42    [W:2.884 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site