lkml.org 
[lkml]   [2021]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] hwmon: (pmbus/bpa-rs600) Remove duplicate defininitions
    Date
    Commit 787c095edaa9 ("hwmon: (pmbus/core) Add support for rated
    attributes") added definitions for MFR_VIN_MIN etc so we can remove the
    local definitions of these from the bpa-rs600 driver.

    Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
    ---
    drivers/hwmon/pmbus/bpa-rs600.c | 25 ++++++++-----------------
    1 file changed, 8 insertions(+), 17 deletions(-)

    diff --git a/drivers/hwmon/pmbus/bpa-rs600.c b/drivers/hwmon/pmbus/bpa-rs600.c
    index d205b41540ce..d495faa89799 100644
    --- a/drivers/hwmon/pmbus/bpa-rs600.c
    +++ b/drivers/hwmon/pmbus/bpa-rs600.c
    @@ -12,15 +12,6 @@
    #include <linux/pmbus.h>
    #include "pmbus.h"

    -#define BPARS600_MFR_VIN_MIN 0xa0
    -#define BPARS600_MFR_VIN_MAX 0xa1
    -#define BPARS600_MFR_IIN_MAX 0xa2
    -#define BPARS600_MFR_PIN_MAX 0xa3
    -#define BPARS600_MFR_VOUT_MIN 0xa4
    -#define BPARS600_MFR_VOUT_MAX 0xa5
    -#define BPARS600_MFR_IOUT_MAX 0xa6
    -#define BPARS600_MFR_POUT_MAX 0xa7
    -
    enum chips { bpa_rs600, bpd_rs600 };

    static int bpa_rs600_read_byte_data(struct i2c_client *client, int page, int reg)
    @@ -83,28 +74,28 @@ static int bpa_rs600_read_word_data(struct i2c_client *client, int page, int pha

    switch (reg) {
    case PMBUS_VIN_UV_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_VIN_MIN);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_VIN_MIN);
    break;
    case PMBUS_VIN_OV_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_VIN_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_VIN_MAX);
    break;
    case PMBUS_VOUT_UV_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_VOUT_MIN);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_VOUT_MIN);
    break;
    case PMBUS_VOUT_OV_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_VOUT_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_VOUT_MAX);
    break;
    case PMBUS_IIN_OC_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_IIN_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_IIN_MAX);
    break;
    case PMBUS_IOUT_OC_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_IOUT_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_IOUT_MAX);
    break;
    case PMBUS_PIN_OP_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_PIN_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_PIN_MAX);
    break;
    case PMBUS_POUT_OP_WARN_LIMIT:
    - ret = pmbus_read_word_data(client, 0, 0xff, BPARS600_MFR_POUT_MAX);
    + ret = pmbus_read_word_data(client, 0, 0xff, PMBUS_MFR_POUT_MAX);
    break;
    case PMBUS_VIN_UV_FAULT_LIMIT:
    case PMBUS_VIN_OV_FAULT_LIMIT:
    --
    2.32.0
    \
     
     \ /
      Last update: 2021-08-11 06:18    [W:3.560 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site