Skip to contentSkip to conversation

drivers: infiniband: remove duplicate includes

PATCH Applied Pravin Shedge 2 participants 2 messages Dec 6, 2017 – Dec 22, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 7/45 drivers: infiniband: remove duplicate includes

These duplicate includes have been found with scripts/checkincludes.pl but they have been removed manually to avoid removing false positives.

---
 drivers/infiniband/core/mad.c                | 1 -
 drivers/infiniband/core/netlink.c            | 2 --
 drivers/infiniband/hw/mlx5/main.c            | 4 +---
 drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 -
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)
drivers/infiniband/core/mad.c +0 -1
index cb91245..c50596f 100644
@@ -49,7 +49,6 @@
 #include "smi.h"
 #include "opa_smi.h"
 #include "agent.h"
-#include "core_priv.h"
 
 static int mad_sendq_size = IB_MAD_QP_SEND_SIZE;
 static int mad_recvq_size = IB_MAD_QP_RECV_SIZE;
drivers/infiniband/core/netlink.c +0 -2
index 1fb72c3..0c7db94 100644
@@ -41,8 +41,6 @@
 #include <linux/module.h>
 #include "core_priv.h"
 
-#include "core_priv.h"
-
 static DEFINE_MUTEX(rdma_nl_mutex);
 static struct sock *nls;
 static struct {
drivers/infiniband/hw/mlx5/main.c +1 -3
index 543d0a4..fe435ed 100644
@@ -50,16 +50,14 @@
 #include <rdma/ib_cache.h>
 #include <linux/mlx5/port.h>
 #include <linux/mlx5/vport.h>
+#include <linux/mlx5/fs.h>
 #include <linux/list.h>
 #include <rdma/ib_smi.h>
 #include <rdma/ib_umem.h>
 #include <linux/in.h>
 #include <linux/etherdevice.h>
-#include <linux/mlx5/fs.h>
-#include <linux/mlx5/vport.h>
 #include "mlx5_ib.h"
 #include "cmd.h"
-#include <linux/mlx5/vport.h>
 
 #define DRIVER_NAME "mlx5_ib"
 #define DRIVER_VERSION "5.0-0"
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +0 -1
index 685ef22..4210ca1 100644
@@ -45,7 +45,6 @@
 #include "usnic_ib_verbs.h"
 #include "usnic_ib_sysfs.h"
 #include "usnic_log.h"
-#include "usnic_ib_sysfs.h"
 
 static ssize_t usnic_ib_show_board(struct device *device,
 					struct device_attribute *attr,
drivers/infiniband/hw/usnic/usnic_ib_verbs.c +0 -1
index aa2456a..a688a56 100644
@@ -47,7 +47,6 @@
 #include "usnic_log.h"
 #include "usnic_uiom.h"
 #include "usnic_transport.h"
-#include "usnic_ib_verbs.h"
 
 #define USNIC_DEFAULT_TRANSPORT USNIC_TRANSPORT_ROCE_CUSTOM
 
Signature · 6 lines
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw
Quoted 10 lines · Pravin Shedge

These duplicate includes have been found with scripts/checkincludes.pl but they have been removed manually to avoid removing false positives.

 drivers/infiniband/core/mad.c                | 1 -
 drivers/infiniband/core/netlink.c            | 2 --
 drivers/infiniband/hw/mlx5/main.c            | 4 +---
 drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 1 -
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

I applied this to for-next, thanks

Quoted 7 lines

index 543d0a4..fe435ed 100644
+++ b/drivers/infiniband/hw/mlx5/main.c

drivers/infiniband/hw/mlx5/main.c +1 -0
@@ -50,16 +50,14 @@
 #include <rdma/ib_cache.h>
 #include <linux/mlx5/port.h>
 #include <linux/mlx5/vport.h>
+#include <linux/mlx5/fs.h>

drivers/infiniband/hw/mlx5/main.c line 62

Quoted 10 lines
drivers/infiniband/hw/mlx5/main.c +0 -3
 #include <linux/list.h>
 #include <rdma/ib_smi.h>
 #include <rdma/ib_umem.h>
 #include <linux/in.h>
 #include <linux/etherdevice.h>
-#include <linux/mlx5/fs.h>
-#include <linux/mlx5/vport.h>
 #include "mlx5_ib.h"
 #include "cmd.h"
-#include <linux/mlx5/vport.h>

Yep, ugh.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html