lkml.org 
[lkml]   [2018]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 126/137] hwmon: (ina2xx) fix sysfs shunt resistor read access
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Lothar Felten <lothar.felten@gmail.com>

    [ Upstream commit 3ad867001c91657c46dcf6656d52eb6080286fd5 ]

    fix the sysfs shunt resistor read access: return the shunt resistor
    value, not the calibration register contents.

    update email address

    Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    Documentation/hwmon/ina2xx | 2 +-
    drivers/hwmon/ina2xx.c | 13 +++++++++++--
    include/linux/platform_data/ina2xx.h | 2 +-
    3 files changed, 13 insertions(+), 4 deletions(-)

    --- a/Documentation/hwmon/ina2xx
    +++ b/Documentation/hwmon/ina2xx
    @@ -32,7 +32,7 @@ Supported chips:
    Datasheet: Publicly available at the Texas Instruments website
    http://www.ti.com/

    -Author: Lothar Felten <l-felten@ti.com>
    +Author: Lothar Felten <lothar.felten@gmail.com>

    Description
    -----------
    --- a/drivers/hwmon/ina2xx.c
    +++ b/drivers/hwmon/ina2xx.c
    @@ -17,7 +17,7 @@
    * Bi-directional Current/Power Monitor with I2C Interface
    * Datasheet: http://www.ti.com/product/ina230
    *
    - * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
    + * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
    * Thanks to Jan Volkering
    *
    * This program is free software; you can redistribute it and/or modify
    @@ -329,6 +329,15 @@ static int ina2xx_set_shunt(struct ina2x
    return 0;
    }

    +static ssize_t ina2xx_show_shunt(struct device *dev,
    + struct device_attribute *da,
    + char *buf)
    +{
    + struct ina2xx_data *data = dev_get_drvdata(dev);
    +
    + return snprintf(buf, PAGE_SIZE, "%li\n", data->rshunt);
    +}
    +
    static ssize_t ina2xx_store_shunt(struct device *dev,
    struct device_attribute *da,
    const char *buf, size_t count)
    @@ -403,7 +412,7 @@ static SENSOR_DEVICE_ATTR(power1_input,

    /* shunt resistance */
    static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR,
    - ina2xx_show_value, ina2xx_store_shunt,
    + ina2xx_show_shunt, ina2xx_store_shunt,
    INA2XX_CALIBRATION);

    /* update interval (ina226 only) */
    --- a/include/linux/platform_data/ina2xx.h
    +++ b/include/linux/platform_data/ina2xx.h
    @@ -1,7 +1,7 @@
    /*
    * Driver for Texas Instruments INA219, INA226 power monitor chips
    *
    - * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
    + * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com>
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License version 2 as

    \
     
     \ /
      Last update: 2018-10-02 15:47    [W:2.799 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site