RDMA/erdma: Remove deliver net device event

Since the netdev events of link status is now handled in ib_core,
remove the related code in drivers.

In addition, remove dev->state as it is only used in erdma_query_port(),
and it can be replaced by ib_get_curr_port_state().

Signed-off-by: Yuyu Li <liyuyu6@huawei.com>
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/erdma/erdma.h b/drivers/infiniband/hw/erdma/erdma.h
index 4f840d8e3bebbd5747033c5b498a0e45d0cab001..2418ac68740473f9cd010e1ec7e9b09653a3b4a8 100644 (file)
--- a/drivers/infiniband/hw/erdma/erdma.h
+++ b/drivers/infiniband/hw/erdma/erdma.h
@@ -195,8 +195,6 @@ struct erdma_dev {
        u8 __iomem *func_bar;
 
        struct erdma_devattr attrs;
-       /* physical port state (only one port per device) */
-       enum ib_port_state state;
        u32 mtu;
 
        /* cmdq and aeq use the same msix vector */

diff --git a/drivers/infiniband/hw/erdma/erdma_main.c b/drivers/infiniband/hw/erdma/erdma_main.c
index 51cc8b17b9e9afe1bfa4de1c9607db91e3a8367b..eabf435c77a3fea39913c059d925972792f543b8 100644 (file)
--- a/drivers/infiniband/hw/erdma/erdma_main.c
+++ b/drivers/infiniband/hw/erdma/erdma_main.c
@@ -26,14 +26,6 @@ static int erdma_netdev_event(struct notifier_block *nb, unsigned long event,
                goto done;
 
        switch (event) {
-       case NETDEV_UP:
-               dev->state = IB_PORT_ACTIVE;
-               erdma_port_event(dev, IB_EVENT_PORT_ACTIVE);
-               break;
-       case NETDEV_DOWN:
-               dev->state = IB_PORT_DOWN;
-               erdma_port_event(dev, IB_EVENT_PORT_ERR);
-               break;
        case NETDEV_CHANGEMTU:
                if (dev->mtu != netdev->mtu) {
                        erdma_set_mtu(dev, netdev->mtu);

diff --git a/drivers/infiniband/hw/erdma/erdma_verbs.c b/drivers/infiniband/hw/erdma/erdma_verbs.c
index e7967193ac821699d6125942509cc38e7f31c4e2..45b377ac9e493acf4003cf423e89e3a6d417110b 100644 (file)
--- a/drivers/infiniband/hw/erdma/erdma_verbs.c
+++ b/drivers/infiniband/hw/erdma/erdma_verbs.c
@@ -396,14 +396,10 @@ int erdma_query_port(struct ib_device *ibdev, u32 port,
        ib_get_eth_speed(ibdev, port, &attr->active_speed, &attr->active_width);
        attr->max_mtu = ib_mtu_int_to_enum(ndev->mtu);
        attr->active_mtu = ib_mtu_int_to_enum(ndev->mtu);
-       if (netif_running(ndev) && netif_carrier_ok(ndev))
-               dev->state = IB_PORT_ACTIVE;
-       else
-               dev->state = IB_PORT_DOWN;
-       attr->state = dev->state;
+       attr->state = ib_get_curr_port_state(ndev);
 
 out:
-       if (dev->state == IB_PORT_ACTIVE)
+       if (attr->state == IB_PORT_ACTIVE)
                attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP;
        else
                attr->phys_state = IB_PORT_PHYS_STATE_DISABLED;