From: Yisen.Zhuang\(Zhuangyuzeng\) Date: Thu, 28 Apr 2016 07:09:02 +0000 (+0800) Subject: net: hns: change port-id property to reg property in dsaf port node X-Git-Tag: MMI-PSA29.97-13-9~7934^2~168^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0211b8fb5dd750357b3113a7c40b879c4a055a98;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net: hns: change port-id property to reg property in dsaf port node Indexes should generally be avoided. So we use reg rather than port-id to index ports. Signed-off-by: Yisen Zhuang Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index 210ba8974a8b..611581fccf2a 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c @@ -834,15 +834,15 @@ int hns_mac_init(struct dsaf_device *dsaf_dev) struct fwnode_handle *child; device_for_each_child_node(dsaf_dev->dev, child) { - ret = fwnode_property_read_u32(child, "port-id", &port_id); + ret = fwnode_property_read_u32(child, "reg", &port_id); if (ret) { dev_err(dsaf_dev->dev, - "get port-id fail, ret=%d!\n", ret); + "get reg fail, ret=%d!\n", ret); return ret; } if (port_id >= max_port_num) { dev_err(dsaf_dev->dev, - "port-id(%u) out of range!\n", port_id); + "reg(%u) out of range!\n", port_id); return -EINVAL; } mac_cb = devm_kzalloc(dsaf_dev->dev, sizeof(*mac_cb),