drivers/scsi/cxgbi: correcting the include path, so can pass compiling.

PATCH In review Chen Gang 1 participant 7 messages Jan 12, 2013 – Apr 7, 2013

Subsystems (3)

SCSI CXGB4 iSCSI driver (CXGB4I) CXGB3 iSCSI driver (CXGB3I)

lore

Share & tools

lore

Chen Gang

author

2013-01-12 12:41 UTC #0 lore raw

PATCH 1/1 drivers/scsi/cxgbi: correcting the include path, so can pass compiling.

correct the include path,
or the compiler will report can not find "common.h"...

both cxgb3/ and cxgb4/ sub directly have l2t.h (they are different). so it is not suitable to '-I' sub-directy, directly.

Signed-off-by Chen Gang <[email protected]>

---
 drivers/scsi/cxgbi/Makefile        |    4 ++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c |   14 +++++++-------
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |   10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

drivers/scsi/cxgbi/Makefile +4 -0

index 86007e3..aff2998 100644
@@ -1,2 +1,6 @@
+
+ccflags-y			:= -Idrivers/net/ethernet/chelsio
+subdir-ccflags-y		:= -Idrivers/net/ethernet/chelsio
+
 obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libcxgbi.o cxgb3i/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libcxgbi.o cxgb4i/

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +7 -7

index 49692a1..ca92e72 100644
@@ -18,13 +18,13 @@
 #include <linux/moduleparam.h>
 #include <scsi/scsi_host.h>
 
-#include "common.h"
-#include "t3_cpl.h"
-#include "t3cdev.h"
-#include "cxgb3_defs.h"
-#include "cxgb3_ctl_defs.h"
-#include "cxgb3_offload.h"
-#include "firmware_exports.h"
+#include "cxgb3/common.h"
+#include "cxgb3/t3_cpl.h"
+#include "cxgb3/t3cdev.h"
+#include "cxgb3/cxgb3_defs.h"
+#include "cxgb3/cxgb3_ctl_defs.h"
+#include "cxgb3/cxgb3_offload.h"
+#include "cxgb3/firmware_exports.h"
 #include "cxgb3i.h"
 
 static unsigned int dbg_level;

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +5 -5

index f924b3c..a5795d5 100644
@@ -20,11 +20,11 @@
 #include <net/dst.h>
 #include <linux/netdevice.h>
 
-#include "t4_msg.h"
-#include "cxgb4.h"
-#include "cxgb4_uld.h"
-#include "t4fw_api.h"
-#include "l2t.h"
+#include "cxgb4/t4_msg.h"
+#include "cxgb4/cxgb4.h"
+#include "cxgb4/cxgb4_uld.h"
+#include "cxgb4/t4fw_api.h"
+#include "cxgb4/l2t.h"
 #include "cxgb4i.h"
 
 static unsigned int dbg_level;

Signature · 1 line

1.7.10.4

Chen Gang

author

2013-01-20 07:17 UTC #1 lore raw

Hello [email protected]

when you have free time, could you give a glance for this patch ?

thanks.

gchen.

Quoted 73 lines · Chen Gang

correct the include path,
or the compiler will report can not find "common.h"...

both cxgb3/ and cxgb4/ sub directly have l2t.h (they are different). so it is not suitable to '-I' sub-directy, directly.

Signed-off-by Chen Gang <[email protected]>

---
 drivers/scsi/cxgbi/Makefile        |    4 ++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c |   14 +++++++-------
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |   10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

drivers/scsi/cxgbi/Makefile +4 -0

index 86007e3..aff2998 100644
@@ -1,2 +1,6 @@
+
+ccflags-y			:= -Idrivers/net/ethernet/chelsio
+subdir-ccflags-y		:= -Idrivers/net/ethernet/chelsio
+
 obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libcxgbi.o cxgb3i/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libcxgbi.o cxgb4i/

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +7 -7

index 49692a1..ca92e72 100644
@@ -18,13 +18,13 @@
 #include <linux/moduleparam.h>
 #include <scsi/scsi_host.h>
 
-#include "common.h"
-#include "t3_cpl.h"
-#include "t3cdev.h"
-#include "cxgb3_defs.h"
-#include "cxgb3_ctl_defs.h"
-#include "cxgb3_offload.h"
-#include "firmware_exports.h"
+#include "cxgb3/common.h"
+#include "cxgb3/t3_cpl.h"
+#include "cxgb3/t3cdev.h"
+#include "cxgb3/cxgb3_defs.h"
+#include "cxgb3/cxgb3_ctl_defs.h"
+#include "cxgb3/cxgb3_offload.h"
+#include "cxgb3/firmware_exports.h"
 #include "cxgb3i.h"
 
 static unsigned int dbg_level;

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +5 -5

index f924b3c..a5795d5 100644
@@ -20,11 +20,11 @@
 #include <net/dst.h>
 #include <linux/netdevice.h>
 
-#include "t4_msg.h"
-#include "cxgb4.h"
-#include "cxgb4_uld.h"
-#include "t4fw_api.h"
-#include "l2t.h"
+#include "cxgb4/t4_msg.h"
+#include "cxgb4/cxgb4.h"
+#include "cxgb4/cxgb4_uld.h"
+#include "cxgb4/t4fw_api.h"
+#include "cxgb4/l2t.h"
 #include "cxgb4i.h"
 
 static unsigned int dbg_level;

Signature · 7 lines

Chen Gang

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

Chen Gang

author

2013-01-29 07:35 UTC #2 lore raw

Hello [email protected]

have you already fixed it by another patches ?

if so:
better to let me know about it, so I should not bother you, again.
else
please give a glance to this patch, when you have time
(since compiling errors are always belong to critical errors)

thanks.

by the way:
I get the sending mail address from ./script/get_maintainer.pl. if I sent to an incorrect member, please tell me.

thanks.

gchen.

Quoted 85 lines · Chen Gang

Hello [email protected]

when you have free time, could you give a glance for this patch ?

thanks.

gchen.

Quoted 73 lines · Chen Gang

correct the include path,
or the compiler will report can not find "common.h"...

both cxgb3/ and cxgb4/ sub directly have l2t.h (they are different). so it is not suitable to '-I' sub-directy, directly.

Signed-off-by Chen Gang <[email protected]>

---
 drivers/scsi/cxgbi/Makefile        |    4 ++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c |   14 +++++++-------
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |   10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

drivers/scsi/cxgbi/Makefile +4 -0

index 86007e3..aff2998 100644
@@ -1,2 +1,6 @@
+
+ccflags-y			:= -Idrivers/net/ethernet/chelsio
+subdir-ccflags-y		:= -Idrivers/net/ethernet/chelsio
+
 obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libcxgbi.o cxgb3i/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libcxgbi.o cxgb4i/

drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +7 -7

index 49692a1..ca92e72 100644
@@ -18,13 +18,13 @@
 #include <linux/moduleparam.h>
 #include <scsi/scsi_host.h>
 
-#include "common.h"
-#include "t3_cpl.h"
-#include "t3cdev.h"
-#include "cxgb3_defs.h"
-#include "cxgb3_ctl_defs.h"
-#include "cxgb3_offload.h"
-#include "firmware_exports.h"
+#include "cxgb3/common.h"
+#include "cxgb3/t3_cpl.h"
+#include "cxgb3/t3cdev.h"
+#include "cxgb3/cxgb3_defs.h"
+#include "cxgb3/cxgb3_ctl_defs.h"
+#include "cxgb3/cxgb3_offload.h"
+#include "cxgb3/firmware_exports.h"
 #include "cxgb3i.h"
 
 static unsigned int dbg_level;

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +5 -5

index f924b3c..a5795d5 100644
@@ -20,11 +20,11 @@
 #include <net/dst.h>
 #include <linux/netdevice.h>
 
-#include "t4_msg.h"
-#include "cxgb4.h"
-#include "cxgb4_uld.h"
-#include "t4fw_api.h"
-#include "l2t.h"
+#include "cxgb4/t4_msg.h"
+#include "cxgb4/cxgb4.h"
+#include "cxgb4/cxgb4_uld.h"
+#include "cxgb4/t4fw_api.h"
+#include "cxgb4/l2t.h"
 #include "cxgb4i.h"
 
 static unsigned int dbg_level;

Signature · 7 lines

Chen Gang

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

Chen Gang

author

2013-02-28 03:24 UTC #3 lore raw

Hello relative Maintainers:

could any one help checking this patch ?

this patch fixes the compiling issue.
the make command in my x86_64 laptop is: "make V=1 allmodconfig" the patch was sent in Jan-12-2013, and get non-reply now.

could you please give a glance when you have time.

thanks.

:-)

gchen.

Quoted 110 lines · Chen Gang

Hello [email protected]
have you already fixed it by another patches ?
if so:
better to let me know about it, so I should not bother you, again.
else
please give a glance to this patch, when you have time
(since compiling errors are always belong to critical errors)
thanks.
by the way:
I get the sending mail address from ./script/get_maintainer.pl. if I sent to an incorrect member, please tell me.
thanks.
gchen.
Quoted 85 lines · Chen Gang
Hello [email protected]
when you have free time, could you give a glance for this patch ?
thanks.
gchen.
Quoted 73 lines · Chen Gang
correct the include path,
or the compiler will report can not find "common.h"...
both cxgb3/ and cxgb4/ sub directly have l2t.h (they are different). so it is not suitable to '-I' sub-directy, directly.
Signed-off-by Chen Gang <[email protected]>
---
 drivers/scsi/cxgbi/Makefile        |    4 ++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c |   14 +++++++-------
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |   10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)
drivers/scsi/cxgbi/Makefile +4 -0
index 86007e3..aff2998 100644
@@ -1,2 +1,6 @@
+
+ccflags-y			:= -Idrivers/net/ethernet/chelsio
+subdir-ccflags-y		:= -Idrivers/net/ethernet/chelsio
+
 obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libcxgbi.o cxgb3i/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libcxgbi.o cxgb4i/
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +7 -7
index 49692a1..ca92e72 100644
@@ -18,13 +18,13 @@
 #include <linux/moduleparam.h>
 #include <scsi/scsi_host.h>
 
-#include "common.h"
-#include "t3_cpl.h"
-#include "t3cdev.h"
-#include "cxgb3_defs.h"
-#include "cxgb3_ctl_defs.h"
-#include "cxgb3_offload.h"
-#include "firmware_exports.h"
+#include "cxgb3/common.h"
+#include "cxgb3/t3_cpl.h"
+#include "cxgb3/t3cdev.h"
+#include "cxgb3/cxgb3_defs.h"
+#include "cxgb3/cxgb3_ctl_defs.h"
+#include "cxgb3/cxgb3_offload.h"
+#include "cxgb3/firmware_exports.h"
 #include "cxgb3i.h"
 
 static unsigned int dbg_level;
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +5 -5
index f924b3c..a5795d5 100644
@@ -20,11 +20,11 @@
 #include <net/dst.h>
 #include <linux/netdevice.h>
 
-#include "t4_msg.h"
-#include "cxgb4.h"
-#include "cxgb4_uld.h"
-#include "t4fw_api.h"
-#include "l2t.h"
+#include "cxgb4/t4_msg.h"
+#include "cxgb4/cxgb4.h"
+#include "cxgb4/cxgb4_uld.h"
+#include "cxgb4/t4fw_api.h"
+#include "cxgb4/l2t.h"
 #include "cxgb4i.h"
 
 static unsigned int dbg_level;

Signature · 7 lines

Chen Gang

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

Chen Gang

author

2013-02-28 06:07 UTC #4 lore raw

I find another more suitable way to fix this issue.
using ccflags-y instead of EXTRA_FLAGS. according to the file ./script/checkpatch.pl:

1755 if (($realfile =~ /Makefile.*/ || $realfile =~ /Kbuild.*/) &&
1756 ($line =~ /\+(EXTRA_[A-Z]+FLAGS).*/)) {
1757 my $flag = $1;
1758 my $replacement = {

1759                                 'EXTRA_AFLAGS' =>   'asflags-y',
1760                                 'EXTRA_CFLAGS' =>   'ccflags-y',
1761                                 'EXTRA_CPPFLAGS' => 'cppflags-y',
1762                                 'EXTRA_LDFLAGS' =>  'ldflags-y',

1763 };
1764
1765 WARN("DEPRECATED_VARIABLE",
1766 "Use of $flag is deprecated, please use \`$replacement->{$flag} instead.\n" . $herecurr) if ($replacement ->{$flag});

I need send new patch for it.

welcome any members to provide additional suggestions or completions.

thanks.

:-)

gchen.

Quoted 130 lines · Chen Gang

Hello relative Maintainers:
could any one help checking this patch ?
this patch fixes the compiling issue.
the make command in my x86_64 laptop is: "make V=1 allmodconfig" the patch was sent in Jan-12-2013, and get non-reply now.
could you please give a glance when you have time.
thanks.
:-)
gchen.
Quoted 110 lines · Chen Gang
Hello [email protected]
have you already fixed it by another patches ?
if so:
better to let me know about it, so I should not bother you, again.
else
please give a glance to this patch, when you have time
(since compiling errors are always belong to critical errors)
thanks.
by the way:
I get the sending mail address from ./script/get_maintainer.pl. if I sent to an incorrect member, please tell me.
thanks.
gchen.
Quoted 85 lines · Chen Gang
Hello [email protected]
when you have free time, could you give a glance for this patch ?
thanks.
gchen.
Quoted 73 lines · Chen Gang
correct the include path,
or the compiler will report can not find "common.h"...
both cxgb3/ and cxgb4/ sub directly have l2t.h (they are different). so it is not suitable to '-I' sub-directy, directly.
Signed-off-by Chen Gang <[email protected]>
---
 drivers/scsi/cxgbi/Makefile        |    4 ++++
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c |   14 +++++++-------
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c |   10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)
drivers/scsi/cxgbi/Makefile +4 -0
index 86007e3..aff2998 100644
@@ -1,2 +1,6 @@
+
+ccflags-y			:= -Idrivers/net/ethernet/chelsio
+subdir-ccflags-y		:= -Idrivers/net/ethernet/chelsio
+
 obj-$(CONFIG_SCSI_CXGB3_ISCSI)	+= libcxgbi.o cxgb3i/
 obj-$(CONFIG_SCSI_CXGB4_ISCSI)	+= libcxgbi.o cxgb4i/
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +7 -7
index 49692a1..ca92e72 100644
@@ -18,13 +18,13 @@
 #include <linux/moduleparam.h>
 #include <scsi/scsi_host.h>
 
-#include "common.h"
-#include "t3_cpl.h"
-#include "t3cdev.h"
-#include "cxgb3_defs.h"
-#include "cxgb3_ctl_defs.h"
-#include "cxgb3_offload.h"
-#include "firmware_exports.h"
+#include "cxgb3/common.h"
+#include "cxgb3/t3_cpl.h"
+#include "cxgb3/t3cdev.h"
+#include "cxgb3/cxgb3_defs.h"
+#include "cxgb3/cxgb3_ctl_defs.h"
+#include "cxgb3/cxgb3_offload.h"
+#include "cxgb3/firmware_exports.h"
 #include "cxgb3i.h"
 
 static unsigned int dbg_level;
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +5 -5
index f924b3c..a5795d5 100644
@@ -20,11 +20,11 @@
 #include <net/dst.h>
 #include <linux/netdevice.h>
 
-#include "t4_msg.h"
-#include "cxgb4.h"
-#include "cxgb4_uld.h"
-#include "t4fw_api.h"
-#include "l2t.h"
+#include "cxgb4/t4_msg.h"
+#include "cxgb4/cxgb4.h"
+#include "cxgb4/cxgb4_uld.h"
+#include "cxgb4/t4fw_api.h"
+#include "cxgb4/l2t.h"
 #include "cxgb4i.h"
 
 static unsigned int dbg_level;

Signature · 3 lines

Chen Gang

Asianux Corporation

Chen Gang

author

2013-02-28 06:35 UTC #5 lore raw

PATCH 1/1 drivers/scsi/cxgbi: using ccflags-y instead of EXTRA_CFLAGS in Kbuild

need using ccflags-y instead of EXTRA_CFLAGS

    can reference scripts/checkpatch.pl (1755..1766)

when make EXTRA_CFLAGS=-W, the compiling issue will be occured.

Signed-off-by Chen Gang <[email protected]>

---
 drivers/scsi/cxgbi/cxgb3i/Kbuild |    2 +-
 drivers/scsi/cxgbi/cxgb4i/Kbuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

drivers/scsi/cxgbi/cxgb3i/Kbuild +1 -1

index 6f095e2..961a12f 100644
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
+ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o

drivers/scsi/cxgbi/cxgb4i/Kbuild +1 -1

index 8290cda..3745864 100644
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
+ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o

Signature · 1 line

1.7.7.6

Chen Gang

author

2013-04-07 03:17 UTC #6 lore raw

Re: [PATCH] drivers/scsi/cxgbi: using ccflags-y instead of EXTRA_CFLAGS in Kbuild

Hello Maintainers:

please help check it when you have time.

thanks.

gchen.

Quoted 32 lines · Chen Gang

need using ccflags-y instead of EXTRA_CFLAGS

    can reference scripts/checkpatch.pl (1755..1766)

when make EXTRA_CFLAGS=-W, the compiling issue will be occured.

Signed-off-by Chen Gang <[email protected]>

---
 drivers/scsi/cxgbi/cxgb3i/Kbuild |    2 +-
 drivers/scsi/cxgbi/cxgb4i/Kbuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

drivers/scsi/cxgbi/cxgb3i/Kbuild +1 -1

index 6f095e2..961a12f 100644
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
+ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o

drivers/scsi/cxgbi/cxgb4i/Kbuild +1 -1

index 8290cda..3745864 100644
@@ -1,3 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
+ccflags-y += -I$(srctree)/drivers/net/ethernet/chelsio/cxgb4
 
 obj-$(CONFIG_SCSI_CXGB4_ISCSI) += cxgb4i.o

Signature · 3 lines

Chen Gang

Asianux Corporation