diff mbox

[net-next,4/7] qed*: Rename qede_roce.[ch]

Message ID 20170615202933.20934-5-Yuval.Mintz@cavium.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Mintz, Yuval June 15, 2017, 8:29 p.m. UTC 
From: Michal Kalderon <Michal.Kalderon@cavium.com>

Once we have iWARP support, the qede portion of the qedr<->qede would
serve all the RDMA protocols - so rename the file to be appropriate
to its function.

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
---
 drivers/infiniband/hw/qedr/main.c                             | 2 +-
 drivers/infiniband/hw/qedr/qedr.h                             | 2 +-
 drivers/net/ethernet/qlogic/qede/Makefile                     | 2 +-
 drivers/net/ethernet/qlogic/qede/qede.h                       | 1 +
 drivers/net/ethernet/qlogic/qede/qede_main.c                  | 1 -
 drivers/net/ethernet/qlogic/qede/{qede_roce.c => qede_rdma.c} | 2 +-
 include/linux/qed/{qede_roce.h => qede_rdma.h}                | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/net/ethernet/qlogic/qede/{qede_roce.c => qede_rdma.c} (99%)
 rename include/linux/qed/{qede_roce.h => qede_rdma.h} (100%)

Comments

kernel test robot June 15, 2017, 9:39 p.m. UTC | #1 
Hi Michal,

[auto build test WARNING on net-next/master]

url:    https://github.com/0day-ci/linux/commits/Yuval-Mintz/qed-RDMA-and-infrastructure-for-iWARP/20170616-043925
config: tile-allmodconfig (attached as .config)
compiler: tilegx-linux-gcc (GCC) 4.6.2
reproduce:
        wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=tile 

All warnings (new ones prefixed by >>):

   In file included from drivers/net//ethernet/qlogic/qede/qede.h:43:0,
                    from drivers/net//ethernet/qlogic/qede/qede_ptp.h:38,
                    from drivers/net//ethernet/qlogic/qede/qede_fp.c:43:
>> include/linux/qed/qede_rdma.h:57:12: warning: 'struct pci_dev' declared inside parameter list [enabled by default]
>> include/linux/qed/qede_rdma.h:57:12: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]

vim +57 include/linux/qed/qede_rdma.h

cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  41  	QEDE_DOWN,
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  42  	QEDE_CHANGE_ADDR,
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  43  	QEDE_CLOSE
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  44  };
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  45  
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  46  struct qede_roce_event_work {
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  47  	struct list_head list;
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  48  	struct work_struct work;
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  49  	void *ptr;
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  50  	enum qede_roce_event event;
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  51  };
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  52  
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  53  struct qedr_driver {
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  54  	unsigned char name[32];
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  55  
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  56  	struct qedr_dev* (*add)(struct qed_dev *, struct pci_dev *,
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01 @57  				struct net_device *);
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  58  
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  59  	void (*remove)(struct qedr_dev *);
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  60  	void (*notify)(struct qedr_dev *, enum qede_roce_event);
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  61  };
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  62  
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  63  /* APIs for RoCE driver to register callback handlers,
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  64   * which will be invoked when device is added, removed, ifup, ifdown
cee9fbd8 include/linux/qed/qede_roce.h Ram Amrani 2016-10-01  65   */

:::::: The code at line 57 was first introduced by commit
:::::: cee9fbd8e2e9e713cd8bf227c6492fd8854de74b qede: Add qedr framework

:::::: TO: Ram Amrani <Ram.Amrani@caviumnetworks.com>
:::::: CC: David S. Miller <davem@davemloft.net>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Mintz, Yuval June 16, 2017, 12:41 p.m. UTC | #2 
>    In file included from drivers/net//ethernet/qlogic/qede/qede.h:43:0,
>                     from drivers/net//ethernet/qlogic/qede/qede_ptp.h:38,
>                     from drivers/net//ethernet/qlogic/qede/qede_fp.c:43:
> >> include/linux/qed/qede_rdma.h:57:12: warning: 'struct pci_dev' declared
> inside parameter list [enabled by default]
> >> include/linux/qed/qede_rdma.h:57:12: warning: its scope is only this
> definition or declaration, which is probably not what you want [enabled by
> default]

This patch is merely renaming qede_roce.h -> qede_rdma.h.
I guess the kbuild test robot got better scripts than the time we've added qede_rdma.h,
or else it would have catched the fact there are no inclusion since then.

Dave - given this is an existing warning exposed due to a rename [and not something
that actually got introduced in this patch], do you want us to fix it via v2 of this series?
Or send a fix for it later?
David Miller June 16, 2017, 3:44 p.m. UTC | #3 
From: "Mintz, Yuval" <Yuval.Mintz@cavium.com>
Date: Fri, 16 Jun 2017 12:41:15 +0000

>>    In file included from drivers/net//ethernet/qlogic/qede/qede.h:43:0,
>>                     from drivers/net//ethernet/qlogic/qede/qede_ptp.h:38,
>>                     from drivers/net//ethernet/qlogic/qede/qede_fp.c:43:
>> >> include/linux/qed/qede_rdma.h:57:12: warning: 'struct pci_dev' declared
>> inside parameter list [enabled by default]
>> >> include/linux/qed/qede_rdma.h:57:12: warning: its scope is only this
>> definition or declaration, which is probably not what you want [enabled by
>> default]
> 
> This patch is merely renaming qede_roce.h -> qede_rdma.h.
> I guess the kbuild test robot got better scripts than the time we've added qede_rdma.h,
> or else it would have catched the fact there are no inclusion since then.
> 
> Dave - given this is an existing warning exposed due to a rename [and not something
> that actually got introduced in this patch], do you want us to fix it via v2 of this series?
> Or send a fix for it later?

I don't know, look at what you're doing in main.c, you're removing an include
rather than changing the name of the file being included.

That is not a zero-change rename at all.

Please respin this and fix all of the things the build bot is reporting as
well as what I just mentioned.

Thank you.
diff mbox

Patch

diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c
index 5a32b80..714eb0c 100644
--- a/drivers/infiniband/hw/qedr/main.c
+++ b/drivers/infiniband/hw/qedr/main.c
@@ -37,7 +37,7 @@ 
 #include <linux/iommu.h>
 #include <linux/pci.h>
 #include <net/addrconf.h>
-#include <linux/qed/qede_roce.h>
+
 #include <linux/qed/qed_chain.h>
 #include <linux/qed/qed_if.h>
 #include "qedr.h"
diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h
index 80333ec..2376019 100644
--- a/drivers/infiniband/hw/qedr/qedr.h
+++ b/drivers/infiniband/hw/qedr/qedr.h
@@ -37,7 +37,7 @@ 
 #include <linux/qed/qed_if.h>
 #include <linux/qed/qed_chain.h>
 #include <linux/qed/qed_roce_if.h>
-#include <linux/qed/qede_roce.h>
+#include <linux/qed/qede_rdma.h>
 #include <linux/qed/roce_common.h>
 #include "qedr_hsi_rdma.h"
 
diff --git a/drivers/net/ethernet/qlogic/qede/Makefile b/drivers/net/ethernet/qlogic/qede/Makefile
index bc5f7c3..75408fb 100644
--- a/drivers/net/ethernet/qlogic/qede/Makefile
+++ b/drivers/net/ethernet/qlogic/qede/Makefile
@@ -2,4 +2,4 @@  obj-$(CONFIG_QEDE) := qede.o
 
 qede-y := qede_main.o qede_fp.o qede_filter.o qede_ethtool.o qede_ptp.o
 qede-$(CONFIG_DCB) += qede_dcbnl.o
-qede-$(CONFIG_QED_RDMA) += qede_roce.o
+qede-$(CONFIG_QED_RDMA) += qede_rdma.o
diff --git a/drivers/net/ethernet/qlogic/qede/qede.h b/drivers/net/ethernet/qlogic/qede/qede.h
index 694c09b..2d6b30c 100644
--- a/drivers/net/ethernet/qlogic/qede/qede.h
+++ b/drivers/net/ethernet/qlogic/qede/qede.h
@@ -40,6 +40,7 @@ 
 #include <linux/kernel.h>
 #include <linux/mutex.h>
 #include <linux/bpf.h>
+#include <linux/qed/qede_rdma.h>
 #include <linux/io.h>
 #ifdef CONFIG_RFS_ACCEL
 #include <linux/cpu_rmap.h>
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 37ad799..e9eaa38 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -60,7 +60,6 @@ 
 #include <net/ip6_checksum.h>
 #include <linux/bitops.h>
 #include <linux/vmalloc.h>
-#include <linux/qed/qede_roce.h>
 #include "qede.h"
 #include "qede_ptp.h"
 
diff --git a/drivers/net/ethernet/qlogic/qede/qede_roce.c b/drivers/net/ethernet/qlogic/qede/qede_rdma.c
similarity index 99%
rename from drivers/net/ethernet/qlogic/qede/qede_roce.c
rename to drivers/net/ethernet/qlogic/qede/qede_rdma.c
index c0030fb..9837ee2 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_roce.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_rdma.c
@@ -33,7 +33,7 @@ 
 #include <linux/netdevice.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/qed/qede_roce.h>
+#include <linux/qed/qede_rdma.h>
 #include "qede.h"
 
 static struct qedr_driver *qedr_drv;
diff --git a/include/linux/qed/qede_roce.h b/include/linux/qed/qede_rdma.h
similarity index 100%
rename from include/linux/qed/qede_roce.h
rename to include/linux/qed/qede_rdma.h