Skip to content

Commit a1fcb10

Browse files
rleondavem330
authored andcommitted
net: hns3: remove always exist devlink pointer check
The devlink pointer always exists after hclge_devlink_init() succeed. Remove that check together with NULL setting after release and ensure that devlink_register is last command prior to call to devlink_reload_enable(). Fixes: b741269 ("net: hns3: add support for registering devlink for PF") Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ed43fba commit a1fcb10

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ int hclge_devlink_init(struct hclge_dev *hdev)
118118

119119
priv = devlink_priv(devlink);
120120
priv->hdev = hdev;
121+
hdev->devlink = devlink;
121122

122123
ret = devlink_register(devlink);
123124
if (ret) {
@@ -126,8 +127,6 @@ int hclge_devlink_init(struct hclge_dev *hdev)
126127
goto out_reg_fail;
127128
}
128129

129-
hdev->devlink = devlink;
130-
131130
devlink_reload_enable(devlink);
132131

133132
return 0;
@@ -141,14 +140,9 @@ void hclge_devlink_uninit(struct hclge_dev *hdev)
141140
{
142141
struct devlink *devlink = hdev->devlink;
143142

144-
if (!devlink)
145-
return;
146-
147143
devlink_reload_disable(devlink);
148144

149145
devlink_unregister(devlink);
150146

151147
devlink_free(devlink);
152-
153-
hdev->devlink = NULL;
154148
}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev)
120120

121121
priv = devlink_priv(devlink);
122122
priv->hdev = hdev;
123+
hdev->devlink = devlink;
123124

124125
ret = devlink_register(devlink);
125126
if (ret) {
@@ -128,8 +129,6 @@ int hclgevf_devlink_init(struct hclgevf_dev *hdev)
128129
goto out_reg_fail;
129130
}
130131

131-
hdev->devlink = devlink;
132-
133132
devlink_reload_enable(devlink);
134133

135134
return 0;
@@ -143,14 +142,9 @@ void hclgevf_devlink_uninit(struct hclgevf_dev *hdev)
143142
{
144143
struct devlink *devlink = hdev->devlink;
145144

146-
if (!devlink)
147-
return;
148-
149145
devlink_reload_disable(devlink);
150146

151147
devlink_unregister(devlink);
152148

153149
devlink_free(devlink);
154-
155-
hdev->devlink = NULL;
156150
}

0 commit comments

Comments
 (0)