On 27/04/2018 6:20 PM, Tarick Bedeir wrote:
Avoid exiting the function with a lingering sysfs file (if the firstAcked-by: Tariq Toukan <tariqt@xxxxxxxxxxxx>
call to device_create_file() fails while the second succeeds), and avoid
calling devlink_port_unregister() twice.
In other words, either mlx4_init_port_info() succeeds and returns zero, or
it fails, returns non-zero, and requires no cleanup.
Signed-off-by: Tarick Bedeir <tarick@xxxxxxxxxx>
---
 drivers/net/ethernet/mellanox/mlx4/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 4d84cab77105..e8a3a45d0b53 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3007,6 +3007,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
ÂÂÂÂÂÂÂÂÂ mlx4_err(dev, "Failed to create file for port %d\n", port);
ÂÂÂÂÂÂÂÂÂ devlink_port_unregister(&info->devlink_port);
ÂÂÂÂÂÂÂÂÂ info->port = -1;
+ÂÂÂÂÂÂÂ return err;
ÂÂÂÂÂ }
ÂÂÂÂÂ sprintf(info->dev_mtu_name, "mlx4_port%d_mtu", port);
@@ -3028,9 +3029,10 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port)
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ &info->port_attr);
ÂÂÂÂÂÂÂÂÂ devlink_port_unregister(&info->devlink_port);
ÂÂÂÂÂÂÂÂÂ info->port = -1;
+ÂÂÂÂÂÂÂ return err;
ÂÂÂÂÂ }
-ÂÂÂ return err;
+ÂÂÂ return 0;
 }
 static void mlx4_cleanup_port_info(struct mlx4_port_info *info)
Thanks Tarick.