lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/6] ab8500_fg: Get rid of 'struct v_to_cap'
    The struct is duplicated, plus when used it causes the following
    warnings:

    CHECK drivers/power/ab8500_fg.c
    ab8500_fg.c:818:13: warning: incorrect type in assignment (different base types)
    ab8500_fg.c:818:13: expected struct v_to_cap *tbl
    ab8500_fg.c:818:13: got struct abx500_v_to_cap *const v_to_cap_tbl
    CC drivers/power/ab8500_fg.o
    ab8500_fg.c: In function 'ab8500_fg_volt_to_capacity':
    ab8500_fg.c:818:6: warning: assignment from incompatible pointer type [enabled by default]

    Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
    ---
    drivers/power/ab8500_fg.c | 2 +-
    include/linux/mfd/abx500/ab8500-bm.h | 10 ----------
    2 files changed, 1 insertions(+), 11 deletions(-)

    diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
    index 41ccb70..180c21a 100644
    --- a/drivers/power/ab8500_fg.c
    +++ b/drivers/power/ab8500_fg.c
    @@ -812,7 +812,7 @@ static int ab8500_fg_bat_voltage(struct ab8500_fg *di)
    static int ab8500_fg_volt_to_capacity(struct ab8500_fg *di, int voltage)
    {
    int i, tbl_size;
    - struct v_to_cap *tbl;
    + struct abx500_v_to_cap *tbl;
    int cap = 0;

    tbl = di->bat->bat_type[di->bat->batt_id].v_to_cap_tbl,
    diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h
    index f61b7b9..44d8620 100644
    --- a/include/linux/mfd/abx500/ab8500-bm.h
    +++ b/include/linux/mfd/abx500/ab8500-bm.h
    @@ -255,16 +255,6 @@ struct batres_vs_temp {
    int resist;
    };

    -/**
    - * struct v_to_cap - Table for translating voltage to capacity
    - * @voltage: Voltage in mV
    - * @capacity: Capacity in percent
    - */
    -struct v_to_cap {
    - int voltage;
    - int capacity;
    -};
    -
    /* Forward declaration */
    struct ab8500_fg;

    --
    1.7.9


    \
     
     \ /
      Last update: 2012-03-14 02:07    [W:0.022 / U:90.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site