Skip to content

Commit a930a46

Browse files
Harish Patildavem330
Harish Patil
authored and
davem330
committed
qlcnic: Rearrange ordering of header files inclusion
Include local headers files after kernel's header files. Signed-off-by: Harish Patil <harish.patil@qlogic.com> Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 07151bc commit a930a46

File tree

10 files changed

+22
-21
lines changed

10 files changed

+22
-21
lines changed

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
#include <linux/mii.h>
2525
#include <linux/timer.h>
2626
#include <linux/irq.h>
27-
2827
#include <linux/vmalloc.h>
29-
3028
#include <linux/io.h>
3129
#include <asm/byteorder.h>
3230
#include <linux/bitops.h>

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
* See LICENSE.qlcnic for copyright and licensing details.
66
*/
77

8-
#include "qlcnic.h"
9-
#include "qlcnic_sriov.h"
108
#include <linux/if_vlan.h>
119
#include <linux/ipv6.h>
1210
#include <linux/ethtool.h>
1311
#include <linux/interrupt.h>
1412
#include <linux/aer.h>
1513

14+
#include "qlcnic.h"
15+
#include "qlcnic_sriov.h"
16+
1617
static void __qlcnic_83xx_process_aen(struct qlcnic_adapter *);
1718
static int qlcnic_83xx_clear_lb_mode(struct qlcnic_adapter *, u8);
1819
static void qlcnic_83xx_configure_mac(struct qlcnic_adapter *, u8 *, u8,

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <linux/types.h>
1212
#include <linux/etherdevice.h>
13+
1314
#include "qlcnic_hw.h"
1415

1516
#define QLCNIC_83XX_BAR0_LENGTH 0x4000

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* See LICENSE.qlcnic for copyright and licensing details.
66
*/
77

8-
#include "qlcnic.h"
9-
#include "qlcnic_hdr.h"
10-
118
#include <linux/slab.h>
129
#include <net/ip.h>
1310
#include <linux/bitops.h>
1411

12+
#include "qlcnic.h"
13+
#include "qlcnic_hdr.h"
14+
1515
#define MASK(n) ((1ULL<<(n))-1)
1616
#define OCM_WIN_P3P(addr) (addr & 0xffc0000)
1717

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
#include <linux/vmalloc.h>
99
#include <linux/interrupt.h>
10-
11-
#include "qlcnic.h"
12-
#include "qlcnic_sriov.h"
13-
#include "qlcnic_hw.h"
14-
1510
#include <linux/swab.h>
1611
#include <linux/dma-mapping.h>
1712
#include <linux/if_vlan.h>
@@ -25,6 +20,10 @@
2520
#include <net/vxlan.h>
2621
#endif
2722

23+
#include "qlcnic.h"
24+
#include "qlcnic_sriov.h"
25+
#include "qlcnic_hw.h"
26+
2827
MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
2928
MODULE_LICENSE("GPL");
3029
MODULE_VERSION(QLCNIC_LINUX_VERSIONID);

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* See LICENSE.qlcnic for copyright and licensing details.
66
*/
77

8+
#include <net/ip.h>
9+
810
#include "qlcnic.h"
911
#include "qlcnic_hdr.h"
1012
#include "qlcnic_83xx_hw.h"
1113
#include "qlcnic_hw.h"
1214

13-
#include <net/ip.h>
14-
1515
#define QLC_83XX_MINIDUMP_FLASH 0x520000
1616
#define QLC_83XX_OCM_INDEX 3
1717
#define QLC_83XX_PCI_INDEX 0

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
#ifndef _QLCNIC_83XX_SRIOV_H_
99
#define _QLCNIC_83XX_SRIOV_H_
1010

11-
#include "qlcnic.h"
1211
#include <linux/types.h>
1312
#include <linux/pci.h>
1413

14+
#include "qlcnic.h"
15+
1516
extern const u32 qlcnic_83xx_reg_tbl[];
1617
extern const u32 qlcnic_83xx_ext_reg_tbl[];
1718

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
* See LICENSE.qlcnic for copyright and licensing details.
66
*/
77

8+
#include <linux/types.h>
9+
810
#include "qlcnic_sriov.h"
911
#include "qlcnic.h"
1012
#include "qlcnic_83xx_hw.h"
11-
#include <linux/types.h>
1213

1314
#define QLC_BC_COMMAND 0
1415
#define QLC_BC_RESPONSE 1

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* See LICENSE.qlcnic for copyright and licensing details.
66
*/
77

8+
#include <linux/types.h>
9+
810
#include "qlcnic_sriov.h"
911
#include "qlcnic.h"
10-
#include <linux/types.h>
1112

1213
#define QLCNIC_SRIOV_VF_MAX_MAC 7
1314
#define QLC_VF_MIN_TX_RATE 100

‎drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
#include <linux/slab.h>
99
#include <linux/interrupt.h>
10-
11-
#include "qlcnic.h"
12-
#include "qlcnic_hw.h"
13-
1410
#include <linux/swab.h>
1511
#include <linux/dma-mapping.h>
1612
#include <net/ip.h>
@@ -24,6 +20,9 @@
2420
#include <linux/hwmon-sysfs.h>
2521
#endif
2622

23+
#include "qlcnic.h"
24+
#include "qlcnic_hw.h"
25+
2726
int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
2827
{
2928
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)