soc: hisilicon: kunpeng_hccs: Fix the 'lane_mode' field name in port info structure...

The lane mode of HCCS port is an information to user, and actually comes
from the maximum lane number. But it is good and easy for driver to use
the maximum lane number. So fix the 'lane_mode' field name in port info
structure to 'max_lane_num'.

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c
index 6055e5091cbd06668f87dac4470a696707e7294e..418e4ee5d9e53fae9ffabadfae45fbed7cf7df03 100644 (file)
--- a/drivers/soc/hisilicon/kunpeng_hccs.c
+++ b/drivers/soc/hisilicon/kunpeng_hccs.c
@@ -594,7 +594,7 @@ static int hccs_get_all_port_info_on_die(struct hccs_dev *hdev,
                port = &die->ports[i];
                port->port_id = attrs[i].port_id;
                port->port_type = attrs[i].port_type;
-               port->lane_mode = attrs[i].lane_mode;
+               port->max_lane_num = attrs[i].max_lane_num;
                port->enable = attrs[i].enable;
                port->die = die;
        }
@@ -839,7 +839,7 @@ static ssize_t lane_mode_show(struct kobject *kobj, struct kobj_attribute *attr,
 {
        const struct hccs_port_info *port = kobj_to_port_info(kobj);
 
-       return sysfs_emit(buf, "x%u\n", port->lane_mode);
+       return sysfs_emit(buf, "x%u\n", port->max_lane_num);
 }
 static struct kobj_attribute lane_mode_attr = __ATTR_RO(lane_mode);
 

diff --git a/drivers/soc/hisilicon/kunpeng_hccs.h b/drivers/soc/hisilicon/kunpeng_hccs.h
index c3adbc01b4719b7cb3ec866698c2ba1f2bbf079a..5e12a1e1474e17c57bd853adc51aec91230d37bf 100644 (file)
--- a/drivers/soc/hisilicon/kunpeng_hccs.h
+++ b/drivers/soc/hisilicon/kunpeng_hccs.h
@@ -19,7 +19,7 @@
 struct hccs_port_info {
        u8 port_id;
        u8 port_type;
-       u8 lane_mode;
+       u8 max_lane_num;
        bool enable; /* if the port is enabled */
        struct kobject kobj;
        bool dir_created;
@@ -113,7 +113,7 @@ struct hccs_die_info_rsp_data {
 struct hccs_port_attr {
        u8 port_id;
        u8 port_type;
-       u8 lane_mode;
+       u8 max_lane_num;
        u8 enable : 1; /* if the port is enabled */
        u16 rsv[2];
 };