lkml.org 
[lkml]   [2008]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] olpc: olpc_battery.c sparse endian annotations
    From
    Date
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
    drivers/power/olpc_battery.c | 20 ++++++++------------
    1 files changed, 8 insertions(+), 12 deletions(-)

    diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
    index 32570af..5fbca26 100644
    --- a/drivers/power/olpc_battery.c
    +++ b/drivers/power/olpc_battery.c
    @@ -205,9 +205,9 @@ static int olpc_bat_get_property(struct power_supply *psy,
    union power_supply_propval *val)
    {
    int ret = 0;
    - int16_t ec_word;
    + __be16 ec_word;
    uint8_t ec_byte;
    - uint64_t ser_buf;
    + __be64 ser_buf;

    ret = olpc_ec_cmd(EC_BAT_STATUS, NULL, 0, &ec_byte, 1);
    if (ret)
    @@ -257,16 +257,14 @@ static int olpc_bat_get_property(struct power_supply *psy,
    if (ret)
    return ret;

    - ec_word = be16_to_cpu(ec_word);
    - val->intval = ec_word * 9760L / 32;
    + val->intval = (int)be16_to_cpu(ec_word) * 9760L / 32;
    break;
    case POWER_SUPPLY_PROP_CURRENT_AVG:
    ret = olpc_ec_cmd(EC_BAT_CURRENT, NULL, 0, (void *)&ec_word, 2);
    if (ret)
    return ret;

    - ec_word = be16_to_cpu(ec_word);
    - val->intval = ec_word * 15625L / 120;
    + val->intval = (int)be16_to_cpu(ec_word) * 15625L / 120;
    break;
    case POWER_SUPPLY_PROP_CAPACITY:
    ret = olpc_ec_cmd(EC_BAT_SOC, NULL, 0, &ec_byte, 1);
    @@ -278,24 +276,22 @@ static int olpc_bat_get_property(struct power_supply *psy,
    ret = olpc_ec_cmd(EC_BAT_TEMP, NULL, 0, (void *)&ec_word, 2);
    if (ret)
    return ret;
    - ec_word = be16_to_cpu(ec_word);
    - val->intval = ec_word * 100 / 256;
    +
    + val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
    break;
    case POWER_SUPPLY_PROP_TEMP_AMBIENT:
    ret = olpc_ec_cmd(EC_AMB_TEMP, NULL, 0, (void *)&ec_word, 2);
    if (ret)
    return ret;

    - ec_word = be16_to_cpu(ec_word);
    - val->intval = ec_word * 100 / 256;
    + val->intval = (int)be16_to_cpu(ec_word) * 100 / 256;
    break;
    case POWER_SUPPLY_PROP_CHARGE_COUNTER:
    ret = olpc_ec_cmd(EC_BAT_ACR, NULL, 0, (void *)&ec_word, 2);
    if (ret)
    return ret;

    - ec_word = be16_to_cpu(ec_word);
    - val->intval = ec_word * 6250 / 15;
    + val->intval = (int)be16_to_cpu(ec_word) * 6250 / 15;
    break;
    case POWER_SUPPLY_PROP_SERIAL_NUMBER:
    ret = olpc_ec_cmd(EC_BAT_SERIAL, NULL, 0, (void *)&ser_buf, 8);
    --
    1.5.6.1.281.g1087e



    \
     
     \ /
      Last update: 2008-07-04 01:37    [W:0.023 / U:2.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site