net: qed: move static iro_arr[] out of header file

Static variables (and functions, unless they're inline) should not
be declared in header files.
Move the static array iro_arr[] from "qed_hsi.h" to the sole place
where it's used, "qed_init_ops.c". This eliminates lots of warnings
(42 of them actually) against W=1+:

In file included from drivers/net/ethernet/qlogic/qed/qed.h:51:0,
                 from drivers/net/ethernet/qlogic/qed/qed_ooo.c:40:
drivers/net/ethernet/qlogic/qed/qed_hsi.h:4421:18: warning: 'iro_arr'
defined but not used [-Wunused-const-variable=]
 static const u32 iro_arr[] = {
                  ^~~~~~~

Signed-off-by: Alexander Lobakin <alobakin@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
index d7e7062..1b5506c 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
@@ -4391,79 +4391,6 @@ void qed_fw_overlay_mem_free(struct qed_hwfn *p_hwfn,
        (IRO[66].base + ((roce_pf_id) * IRO[66].m1))
 #define USTORM_ROCE_CQE_STATS_SIZE                     (IRO[66].size)
 
-/* IRO Array */
-static const u32 iro_arr[] = {
-       0x00000000, 0x00000000, 0x00080000,
-       0x00003288, 0x00000088, 0x00880000,
-       0x000058e8, 0x00000020, 0x00200000,
-       0x00000b00, 0x00000008, 0x00040000,
-       0x00000a80, 0x00000008, 0x00040000,
-       0x00000000, 0x00000008, 0x00020000,
-       0x00000080, 0x00000008, 0x00040000,
-       0x00000084, 0x00000008, 0x00020000,
-       0x00005718, 0x00000004, 0x00040000,
-       0x00004dd0, 0x00000000, 0x00780000,
-       0x00003e40, 0x00000000, 0x00780000,
-       0x00004480, 0x00000000, 0x00780000,
-       0x00003210, 0x00000000, 0x00780000,
-       0x00003b50, 0x00000000, 0x00780000,
-       0x00007f58, 0x00000000, 0x00780000,
-       0x00005f58, 0x00000000, 0x00080000,
-       0x00007100, 0x00000000, 0x00080000,
-       0x0000aea0, 0x00000000, 0x00080000,
-       0x00004398, 0x00000000, 0x00080000,
-       0x0000a5a0, 0x00000000, 0x00080000,
-       0x0000bde8, 0x00000000, 0x00080000,
-       0x00000020, 0x00000004, 0x00040000,
-       0x000056c8, 0x00000010, 0x00100000,
-       0x0000c210, 0x00000030, 0x00300000,
-       0x0000b088, 0x00000038, 0x00380000,
-       0x00003d20, 0x00000080, 0x00400000,
-       0x0000bf60, 0x00000000, 0x00040000,
-       0x00004560, 0x00040080, 0x00040000,
-       0x000001f8, 0x00000004, 0x00040000,
-       0x00003d60, 0x00000080, 0x00200000,
-       0x00008960, 0x00000040, 0x00300000,
-       0x0000e840, 0x00000060, 0x00600000,
-       0x00004618, 0x00000080, 0x00380000,
-       0x00010738, 0x000000c0, 0x00c00000,
-       0x000001f8, 0x00000002, 0x00020000,
-       0x0000a2a0, 0x00000000, 0x01080000,
-       0x0000a3a8, 0x00000008, 0x00080000,
-       0x000001c0, 0x00000008, 0x00080000,
-       0x000001f8, 0x00000008, 0x00080000,
-       0x00000ac0, 0x00000008, 0x00080000,
-       0x00002578, 0x00000008, 0x00080000,
-       0x000024f8, 0x00000008, 0x00080000,
-       0x00000280, 0x00000008, 0x00080000,
-       0x00000680, 0x00080018, 0x00080000,
-       0x00000b78, 0x00080018, 0x00020000,
-       0x0000c640, 0x00000050, 0x003c0000,
-       0x00012038, 0x00000018, 0x00100000,
-       0x00011b00, 0x00000040, 0x00180000,
-       0x000095d0, 0x00000050, 0x00200000,
-       0x00008b10, 0x00000040, 0x00280000,
-       0x00011640, 0x00000018, 0x00100000,
-       0x0000c828, 0x00000048, 0x00380000,
-       0x00011710, 0x00000020, 0x00200000,
-       0x00004650, 0x00000080, 0x00100000,
-       0x00003618, 0x00000010, 0x00100000,
-       0x0000a968, 0x00000008, 0x00010000,
-       0x000097a0, 0x00000008, 0x00010000,
-       0x00011990, 0x00000008, 0x00010000,
-       0x0000f018, 0x00000008, 0x00010000,
-       0x00012628, 0x00000008, 0x00010000,
-       0x00011da8, 0x00000008, 0x00010000,
-       0x0000aa78, 0x00000030, 0x00100000,
-       0x0000d768, 0x00000028, 0x00280000,
-       0x00009a58, 0x00000018, 0x00180000,
-       0x00009bd8, 0x00000008, 0x00080000,
-       0x00013a18, 0x00000008, 0x00080000,
-       0x000126e8, 0x00000018, 0x00180000,
-       0x0000e608, 0x00500288, 0x00100000,
-       0x00012970, 0x00000138, 0x00280000,
-};
-
 /* Runtime array offsets */
 #define DORQ_REG_PF_MAX_ICID_0_RT_OFFSET                               0
 #define DORQ_REG_PF_MAX_ICID_1_RT_OFFSET                               1

diff --git a/drivers/net/ethernet/qlogic/qed/qed_init_ops.c b/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
index 736702f..7e6c638 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_init_ops.c
@@ -43,6 +43,79 @@ static u32 pxp_global_win[] = {
        0,
 };
 
+/* IRO Array */
+static const u32 iro_arr[] = {
+       0x00000000, 0x00000000, 0x00080000,
+       0x00003288, 0x00000088, 0x00880000,
+       0x000058e8, 0x00000020, 0x00200000,
+       0x00000b00, 0x00000008, 0x00040000,
+       0x00000a80, 0x00000008, 0x00040000,
+       0x00000000, 0x00000008, 0x00020000,
+       0x00000080, 0x00000008, 0x00040000,
+       0x00000084, 0x00000008, 0x00020000,
+       0x00005718, 0x00000004, 0x00040000,
+       0x00004dd0, 0x00000000, 0x00780000,
+       0x00003e40, 0x00000000, 0x00780000,
+       0x00004480, 0x00000000, 0x00780000,
+       0x00003210, 0x00000000, 0x00780000,
+       0x00003b50, 0x00000000, 0x00780000,
+       0x00007f58, 0x00000000, 0x00780000,
+       0x00005f58, 0x00000000, 0x00080000,
+       0x00007100, 0x00000000, 0x00080000,
+       0x0000aea0, 0x00000000, 0x00080000,
+       0x00004398, 0x00000000, 0x00080000,
+       0x0000a5a0, 0x00000000, 0x00080000,
+       0x0000bde8, 0x00000000, 0x00080000,
+       0x00000020, 0x00000004, 0x00040000,
+       0x000056c8, 0x00000010, 0x00100000,
+       0x0000c210, 0x00000030, 0x00300000,
+       0x0000b088, 0x00000038, 0x00380000,
+       0x00003d20, 0x00000080, 0x00400000,
+       0x0000bf60, 0x00000000, 0x00040000,
+       0x00004560, 0x00040080, 0x00040000,
+       0x000001f8, 0x00000004, 0x00040000,
+       0x00003d60, 0x00000080, 0x00200000,
+       0x00008960, 0x00000040, 0x00300000,
+       0x0000e840, 0x00000060, 0x00600000,
+       0x00004618, 0x00000080, 0x00380000,
+       0x00010738, 0x000000c0, 0x00c00000,
+       0x000001f8, 0x00000002, 0x00020000,
+       0x0000a2a0, 0x00000000, 0x01080000,
+       0x0000a3a8, 0x00000008, 0x00080000,
+       0x000001c0, 0x00000008, 0x00080000,
+       0x000001f8, 0x00000008, 0x00080000,
+       0x00000ac0, 0x00000008, 0x00080000,
+       0x00002578, 0x00000008, 0x00080000,
+       0x000024f8, 0x00000008, 0x00080000,
+       0x00000280, 0x00000008, 0x00080000,
+       0x00000680, 0x00080018, 0x00080000,
+       0x00000b78, 0x00080018, 0x00020000,
+       0x0000c640, 0x00000050, 0x003c0000,
+       0x00012038, 0x00000018, 0x00100000,
+       0x00011b00, 0x00000040, 0x00180000,
+       0x000095d0, 0x00000050, 0x00200000,
+       0x00008b10, 0x00000040, 0x00280000,
+       0x00011640, 0x00000018, 0x00100000,
+       0x0000c828, 0x00000048, 0x00380000,
+       0x00011710, 0x00000020, 0x00200000,
+       0x00004650, 0x00000080, 0x00100000,
+       0x00003618, 0x00000010, 0x00100000,
+       0x0000a968, 0x00000008, 0x00010000,
+       0x000097a0, 0x00000008, 0x00010000,
+       0x00011990, 0x00000008, 0x00010000,
+       0x0000f018, 0x00000008, 0x00010000,
+       0x00012628, 0x00000008, 0x00010000,
+       0x00011da8, 0x00000008, 0x00010000,
+       0x0000aa78, 0x00000030, 0x00100000,
+       0x0000d768, 0x00000028, 0x00280000,
+       0x00009a58, 0x00000018, 0x00180000,
+       0x00009bd8, 0x00000008, 0x00080000,
+       0x00013a18, 0x00000008, 0x00080000,
+       0x000126e8, 0x00000018, 0x00180000,
+       0x0000e608, 0x00500288, 0x00100000,
+       0x00012970, 0x00000138, 0x00280000,
+};
+
 void qed_init_iro_array(struct qed_dev *cdev)
 {
        cdev->iro_arr = iro_arr;