Commit 6162928c authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller

net: hns: use device_* APIs instead of of_* APIs

OF series functions can be used only for DT case. Use unified
device property function instead to support both DT and ACPI.
Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a99ff5a
...@@ -50,7 +50,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) ...@@ -50,7 +50,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)
else else
dsaf_dev->dsaf_ver = AE_VERSION_2; dsaf_dev->dsaf_ver = AE_VERSION_2;
ret = of_property_read_string(np, "mode", &mode_str); ret = device_property_read_string(dsaf_dev->dev, "mode", &mode_str);
if (ret) { if (ret) {
dev_err(dsaf_dev->dev, "get dsaf mode fail, ret=%d!\n", ret); dev_err(dsaf_dev->dev, "get dsaf mode fail, ret=%d!\n", ret);
return ret; return ret;
...@@ -142,7 +142,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) ...@@ -142,7 +142,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)
} }
} }
ret = of_property_read_u32(np, "desc-num", &desc_num); ret = device_property_read_u32(dsaf_dev->dev, "desc-num", &desc_num);
if (ret < 0 || desc_num < HNS_DSAF_MIN_DESC_CNT || if (ret < 0 || desc_num < HNS_DSAF_MIN_DESC_CNT ||
desc_num > HNS_DSAF_MAX_DESC_CNT) { desc_num > HNS_DSAF_MAX_DESC_CNT) {
dev_err(dsaf_dev->dev, "get desc-num(%d) fail, ret=%d!\n", dev_err(dsaf_dev->dev, "get desc-num(%d) fail, ret=%d!\n",
...@@ -151,14 +151,15 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) ...@@ -151,14 +151,15 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev)
} }
dsaf_dev->desc_num = desc_num; dsaf_dev->desc_num = desc_num;
ret = of_property_read_u32(np, "reset-field-offset", &reset_offset); ret = device_property_read_u32(dsaf_dev->dev, "reset-field-offset",
&reset_offset);
if (ret < 0) { if (ret < 0) {
dev_dbg(dsaf_dev->dev, dev_dbg(dsaf_dev->dev,
"get reset-field-offset fail, ret=%d!\r\n", ret); "get reset-field-offset fail, ret=%d!\r\n", ret);
} }
dsaf_dev->reset_offset = reset_offset; dsaf_dev->reset_offset = reset_offset;
ret = of_property_read_u32(np, "buf-size", &buf_size); ret = device_property_read_u32(dsaf_dev->dev, "buf-size", &buf_size);
if (ret < 0) { if (ret < 0) {
dev_err(dsaf_dev->dev, dev_err(dsaf_dev->dev,
"get buf-size fail, ret=%d!\r\n", ret); "get buf-size fail, ret=%d!\r\n", ret);
......
...@@ -1067,13 +1067,8 @@ void hns_nic_update_stats(struct net_device *netdev) ...@@ -1067,13 +1067,8 @@ void hns_nic_update_stats(struct net_device *netdev)
static void hns_init_mac_addr(struct net_device *ndev) static void hns_init_mac_addr(struct net_device *ndev)
{ {
struct hns_nic_priv *priv = netdev_priv(ndev); struct hns_nic_priv *priv = netdev_priv(ndev);
struct device_node *node = priv->dev->of_node;
const void *mac_addr_temp;
mac_addr_temp = of_get_mac_address(node); if (!device_get_mac_address(priv->dev, ndev->dev_addr, ETH_ALEN)) {
if (mac_addr_temp && is_valid_ether_addr(mac_addr_temp)) {
memcpy(ndev->dev_addr, mac_addr_temp, ndev->addr_len);
} else {
eth_hw_addr_random(ndev); eth_hw_addr_random(ndev);
dev_warn(priv->dev, "No valid mac, use random mac %pM", dev_warn(priv->dev, "No valid mac, use random mac %pM",
ndev->dev_addr); ndev->dev_addr);
...@@ -1898,10 +1893,10 @@ static int hns_nic_dev_probe(struct platform_device *pdev) ...@@ -1898,10 +1893,10 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
goto out_read_prop_fail; goto out_read_prop_fail;
} }
/* try to find port-idx-in-ae first */ /* try to find port-idx-in-ae first */
ret = of_property_read_u32(node, "port-idx-in-ae", &port_id); ret = device_property_read_u32(dev, "port-idx-in-ae", &port_id);
if (ret) { if (ret) {
/* only for old code compatible */ /* only for old code compatible */
ret = of_property_read_u32(node, "port-id", &port_id); ret = device_property_read_u32(dev, "port-id", &port_id);
if (ret) if (ret)
goto out_read_prop_fail; goto out_read_prop_fail;
/* for old dts, we need to caculate the port offset */ /* for old dts, we need to caculate the port offset */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment