bnxt_en: Modify the driver to use hwmon_device_register_with_info

The use of hwmon_device_register_with_groups() is deprecated.
Modified the driver to use hwmon_device_register_with_info().

Driver currently exports only temp1_input through hwmon sysfs
interface. But FW has been modified to report more threshold
temperatures and driver want to report them through the
hwmon interface.

Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c
index 476616d97071ff508e50af37812582066d03c57d..05e3d75f3c43de6f11f1f51d75e3a1421f3bf99d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c
@@ -18,34 +18,73 @@
 #include "bnxt_hwrm.h"
 #include "bnxt_hwmon.h"
 
-static ssize_t bnxt_show_temp(struct device *dev,
-                             struct device_attribute *devattr, char *buf)
+static int bnxt_hwrm_temp_query(struct bnxt *bp, u8 *temp)
 {
        struct hwrm_temp_monitor_query_output *resp;
        struct hwrm_temp_monitor_query_input *req;
-       struct bnxt *bp = dev_get_drvdata(dev);
-       u32 len = 0;
        int rc;
 
        rc = hwrm_req_init(bp, req, HWRM_TEMP_MONITOR_QUERY);
        if (rc)
                return rc;
        resp = hwrm_req_hold(bp, req);
-       rc = hwrm_req_send(bp, req);
-       if (!rc)
-               len = sprintf(buf, "%u\n", resp->temp * 1000); /* display millidegree */
-       hwrm_req_drop(bp, req);
+       rc = hwrm_req_send_silent(bp, req);
        if (rc)
+               goto drop_req;
+
+       *temp = resp->temp;
+
+drop_req:
+       hwrm_req_drop(bp, req);
+       return rc;
+}
+
+static umode_t bnxt_hwmon_is_visible(const void *_data, enum hwmon_sensor_types type,
+                                    u32 attr, int channel)
+{
+       if (type != hwmon_temp)
+               return 0;
+
+       switch (attr) {
+       case hwmon_temp_input:
+               return 0444;
+       default:
+               return 0;
+       }
+}
+
+static int bnxt_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
+                          int channel, long *val)
+{
+       struct bnxt *bp = dev_get_drvdata(dev);
+       u8 temp = 0;
+       int rc;
+
+       switch (attr) {
+       case hwmon_temp_input:
+               rc = bnxt_hwrm_temp_query(bp, &temp);
+               if (!rc)
+                       *val = temp * 1000;
                return rc;
-       return len;
+       default:
+               return -EOPNOTSUPP;
+       }
 }
-static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);
 
-static struct attribute *bnxt_attrs[] = {
-       &sensor_dev_attr_temp1_input.dev_attr.attr,
+static const struct hwmon_channel_info *bnxt_hwmon_info[] = {
+       HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),
        NULL
 };
-ATTRIBUTE_GROUPS(bnxt);
+
+static const struct hwmon_ops bnxt_hwmon_ops = {
+       .is_visible     = bnxt_hwmon_is_visible,
+       .read           = bnxt_hwmon_read,
+};
+
+static const struct hwmon_chip_info bnxt_hwmon_chip_info = {
+       .ops    = &bnxt_hwmon_ops,
+       .info   = bnxt_hwmon_info,
+};
 
 void bnxt_hwmon_uninit(struct bnxt *bp)
 {
@@ -72,9 +111,9 @@ void bnxt_hwmon_init(struct bnxt *bp)
        if (bp->hwmon_dev)
                return;
 
-       bp->hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
-                                                         DRV_MODULE_NAME, bp,
-                                                         bnxt_groups);
+       bp->hwmon_dev = hwmon_device_register_with_info(&pdev->dev,
+                                                       DRV_MODULE_NAME, bp,
+                                                       &bnxt_hwmon_chip_info, NULL);
        if (IS_ERR(bp->hwmon_dev)) {
                bp->hwmon_dev = NULL;
                dev_warn(&pdev->dev, "Cannot register hwmon device\n");