hwmon: (pmbus) Always call _pmbus_read_byte in core driver

Always call _pmbus_read_byte() instead of pmbus_read_byte() in PMBus core
driver. With this change, device specific read functions can be implemented for
all registers.

Since the device specific read_byte function is now always called, we need to be
more careful with page validations. Only fail if the passed page number is larger
than 0, since -1 means "current page".

Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>

diff --git a/drivers/hwmon/pmbus/adm1275.c b/drivers/hwmon/pmbus/adm1275.c
index fa1811274c278092c5fd2a198fc14622e2a0413c..980a4d9d502865399cfb71d36bfaee4a5d0d5301 100644 (file)
--- a/drivers/hwmon/pmbus/adm1275.c
+++ b/drivers/hwmon/pmbus/adm1275.c
@@ -144,7 +144,7 @@ static int adm1275_read_byte_data(struct i2c_client *client, int page, int reg)
        const struct adm1275_data *data = to_adm1275_data(info);
        int mfr_status, ret;
 
-       if (page)
+       if (page > 0)
                return -ENXIO;
 
        switch (reg) {

diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index a72bb9f51decd7160d91cb29f51f538221eea9c4..84a37f0c8db6f4d885064cb5179a47bf3801ec8d 100644 (file)
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -166,8 +166,8 @@ static int lm25066_write_byte(struct i2c_client *client, int page, u8 value)
        if (page > 1)
                return -ENXIO;
 
-       if (page == 0)
-               return pmbus_write_byte(client, 0, value);
+       if (page <= 0)
+               return pmbus_write_byte(client, page, value);
 
        return 0;
 }

diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index c824365e4aa4ee69fdb161e9b820771019de84c8..beaf5a8d9c45063e08a9ee22ee0b6f23a97e51b5 100644 (file)
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -93,12 +93,14 @@ static int max34440_write_word_data(struct i2c_client *client, int page,
 
 static int max34440_read_byte_data(struct i2c_client *client, int page, int reg)
 {
-       int ret;
+       int ret = 0;
        int mfg_status;
 
-       ret = pmbus_set_page(client, page);
-       if (ret < 0)
-               return ret;
+       if (page >= 0) {
+               ret = pmbus_set_page(client, page);
+               if (ret < 0)
+                       return ret;
+       }
 
        switch (reg) {
        case PMBUS_STATUS_IOUT:

diff --git a/drivers/hwmon/pmbus/max8688.c b/drivers/hwmon/pmbus/max8688.c
index 7113f1131e4a5e646923c1571de1b78e0a64b190..e2b74bb399ba36ce02c65003c104ae12d1136af6 100644 (file)
--- a/drivers/hwmon/pmbus/max8688.c
+++ b/drivers/hwmon/pmbus/max8688.c
@@ -101,7 +101,7 @@ static int max8688_read_byte_data(struct i2c_client *client, int page, int reg)
        int ret = 0;
        int mfg_status;
 
-       if (page)
+       if (page > 0)
                return -ENXIO;
 
        switch (reg) {

diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 7841ea0c10a3e2bac5a4c6c08d599c53c6aa3c8e..f241a4d2cf8f7eeb4a7005949bc41b3e0419122a 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -316,9 +316,9 @@ static int pmbus_check_status_cml(struct i2c_client *client)
 {
        int status, status2;
 
-       status = pmbus_read_byte_data(client, -1, PMBUS_STATUS_BYTE);
+       status = _pmbus_read_byte_data(client, -1, PMBUS_STATUS_BYTE);
        if (status < 0 || (status & PB_STATUS_CML)) {
-               status2 = pmbus_read_byte_data(client, -1, PMBUS_STATUS_CML);
+               status2 = _pmbus_read_byte_data(client, -1, PMBUS_STATUS_CML);
                if (status2 < 0 || (status2 & PB_CML_FAULT_INVALID_COMMAND))
                        return -EIO;
        }
@@ -371,8 +371,8 @@ static struct pmbus_data *pmbus_update_device(struct device *dev)
 
                for (i = 0; i < info->pages; i++)
                        data->status[PB_STATUS_BASE + i]
-                           = pmbus_read_byte_data(client, i,
-                                                  PMBUS_STATUS_BYTE);
+                           = _pmbus_read_byte_data(client, i,
+                                                   PMBUS_STATUS_BYTE);
                for (i = 0; i < info->pages; i++) {
                        if (!(info->func[i] & PMBUS_HAVE_STATUS_VOUT))
                                continue;
@@ -1596,7 +1596,7 @@ static int pmbus_identify_common(struct i2c_client *client,
        int vout_mode = -1, exponent;
 
        if (pmbus_check_byte_register(client, 0, PMBUS_VOUT_MODE))
-               vout_mode = pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);
+               vout_mode = _pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);
        if (vout_mode >= 0 && vout_mode != 0xff) {
                /*
                 * Not all chips support the VOUT_MODE command,

diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c
index 1536db6543f00ebf98ff3ac07e6bceb9f3c53185..4ff6cf289f8524c2cc1c41868f61043cc9867659 100644 (file)
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
@@ -74,7 +74,7 @@ static int ucd9000_read_byte_data(struct i2c_client *client, int page, int reg)
 
        switch (reg) {
        case PMBUS_FAN_CONFIG_12:
-               if (page)
+               if (page > 0)
                        return -ENXIO;
 
                ret = ucd9000_get_fan_config(client, 0);
@@ -88,7 +88,7 @@ static int ucd9000_read_byte_data(struct i2c_client *client, int page, int reg)
                ret = fan_config;
                break;
        case PMBUS_FAN_CONFIG_34:
-               if (page)
+               if (page > 0)
                        return -ENXIO;
 
                ret = ucd9000_get_fan_config(client, 2);