mlx4: Get rid of the mlx4_interface.activate callback

The mlx4_interface.activate callback was introduced in commit
79857cd31fe7 ("net/mlx4: Postpone the registration of net_device"). It
dealt with a situation when a netdev notifier received a NETDEV_REGISTER
event for a new net_device created by mlx4_en but the same device was
not yet visible to mlx4_get_protocol_dev(). The callback can be removed
now that mlx4_get_protocol_dev() is gone.

Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
Tested-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Acked-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_main.c b/drivers/net/ethernet/mellanox/mlx4/en_main.c
index 31bf625b8158e2e04d33b28684c97b6a3734f4fd..39c9befeb6388d5ddffb18229025f4e1a9539651 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_main.c
@@ -259,26 +259,6 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr)
        kfree(mdev);
 }
 
-static void mlx4_en_activate(struct mlx4_dev *dev, void *ctx)
-{
-       int i;
-       struct mlx4_en_dev *mdev = ctx;
-
-       /* Create a netdev for each port */
-       mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-               mlx4_info(mdev, "Activating port:%d\n", i);
-               if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
-                       mdev->pndev[i] = NULL;
-       }
-
-       /* register netdev notifier */
-       mdev->netdev_nb.notifier_call = mlx4_en_netdev_event;
-       if (register_netdevice_notifier(&mdev->netdev_nb)) {
-               mdev->netdev_nb.notifier_call = NULL;
-               mlx4_err(mdev, "Failed to create netdev notifier\n");
-       }
-}
-
 static void *mlx4_en_add(struct mlx4_dev *dev)
 {
        struct mlx4_en_dev *mdev;
@@ -350,6 +330,22 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
        err = mlx4_register_event_notifier(dev, &mdev->mlx_nb);
        WARN(err, "failed to register mlx4 event notifier (%d)", err);
 
+       /* Setup ports */
+
+       /* Create a netdev for each port */
+       mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
+               mlx4_info(mdev, "Activating port:%d\n", i);
+               if (mlx4_en_init_netdev(mdev, i, &mdev->profile.prof[i]))
+                       mdev->pndev[i] = NULL;
+       }
+
+       /* register netdev notifier */
+       mdev->netdev_nb.notifier_call = mlx4_en_netdev_event;
+       if (register_netdevice_notifier(&mdev->netdev_nb)) {
+               mdev->netdev_nb.notifier_call = NULL;
+               mlx4_err(mdev, "Failed to create netdev notifier\n");
+       }
+
        return mdev;
 
 err_mr:
@@ -371,7 +367,6 @@ static struct mlx4_interface mlx4_en_interface = {
        .add            = mlx4_en_add,
        .remove         = mlx4_en_remove,
        .protocol       = MLX4_PROT_ETH,
-       .activate       = mlx4_en_activate,
 };
 
 static void mlx4_en_verify_params(void)

diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c
index fecb63e6960737ff8bb27dd788314c89d84b6c5c..8cbc1bcdfe777aff7ba66955007f3a529208e935 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -64,8 +64,6 @@ static void mlx4_add_device(struct mlx4_interface *intf, struct mlx4_priv *priv)
                spin_lock_irq(&priv->ctx_lock);
                list_add_tail(&dev_ctx->list, &priv->ctx_list);
                spin_unlock_irq(&priv->ctx_lock);
-               if (intf->activate)
-                       intf->activate(&priv->dev, dev_ctx->context);
        } else
                kfree(dev_ctx);
 

diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index 228da8ed7e7507e1ca5d4ee12dcc01d56ae66823..0f8c9ba4c5744b1c177294e5fca0da3d41700a70 100644 (file)
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -58,7 +58,6 @@ enum {
 struct mlx4_interface {
        void *                  (*add)   (struct mlx4_dev *dev);
        void                    (*remove)(struct mlx4_dev *dev, void *context);
-       void                    (*activate)(struct mlx4_dev *dev, void *context);
        struct list_head        list;
        enum mlx4_protocol      protocol;
        int                     flags;