libertas: make lbs_init_mesh() void
authorJason Yan <yanaijie@huawei.com>
Fri, 10 Apr 2020 09:09:42 +0000 (17:09 +0800)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 15 Apr 2020 08:39:02 +0000 (11:39 +0300)
Fix the following coccicheck warning:

drivers/net/wireless/marvell/libertas/mesh.c:833:5-8: Unneeded variable:
"ret". Return "0" on line 874

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200410090942.27239-1-yanaijie@huawei.com
drivers/net/wireless/marvell/libertas/mesh.c
drivers/net/wireless/marvell/libertas/mesh.h

index 44c8a55..f5b7825 100644 (file)
@@ -828,10 +828,8 @@ static void lbs_persist_config_remove(struct net_device *dev)
  * Check mesh FW version and appropriately send the mesh start
  * command
  */
-int lbs_init_mesh(struct lbs_private *priv)
+void lbs_init_mesh(struct lbs_private *priv)
 {
-       int ret = 0;
-
        /* Determine mesh_fw_ver from fwrelease and fwcapinfo */
        /* 5.0.16p0 9.0.0.p0 is known to NOT support any mesh */
        /* 5.110.22 have mesh command with 0xa3 command id */
@@ -870,8 +868,6 @@ int lbs_init_mesh(struct lbs_private *priv)
 
        /* Stop meshing until interface is brought up */
        lbs_mesh_config(priv, CMD_ACT_MESH_CONFIG_STOP, 1);
-
-       return ret;
 }
 
 void lbs_start_mesh(struct lbs_private *priv)
index 1561018..d49717b 100644 (file)
@@ -16,7 +16,7 @@
 
 struct net_device;
 
-int lbs_init_mesh(struct lbs_private *priv);
+void lbs_init_mesh(struct lbs_private *priv);
 void lbs_start_mesh(struct lbs_private *priv);
 int lbs_deinit_mesh(struct lbs_private *priv);