Skip to content

Commit 2846fe5

Browse files
pkitszelanguy11
authored andcommitted
ice: rename devlink_port.[ch] to port.[ch]
Drop "devlink_" prefix from files that sit in devlink/. I'm going to add more files there, and repeating "devlink" does not feel good. This is also the scheme used in most other places, most notably the devlink core files are named like that. devlink.[ch] stays as is. Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 3dbfde7 commit 2846fe5

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

drivers/net/ethernet/intel/ice/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ice-y := ice_main.o \
3232
ice_parser_rt.o \
3333
ice_idc.o \
3434
devlink/devlink.o \
35-
devlink/devlink_port.o \
35+
devlink/port.o \
3636
ice_sf_eth.o \
3737
ice_sf_vsi_vlan_ops.o \
3838
ice_ddp.o \

drivers/net/ethernet/intel/ice/devlink/devlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "ice.h"
77
#include "ice_lib.h"
88
#include "devlink.h"
9-
#include "devlink_port.h"
9+
#include "port.h"
1010
#include "ice_eswitch.h"
1111
#include "ice_fw_update.h"
1212
#include "ice_dcb_lib.h"

drivers/net/ethernet/intel/ice/devlink/devlink_port.c renamed to drivers/net/ethernet/intel/ice/devlink/port.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "ice.h"
77
#include "devlink.h"
8-
#include "devlink_port.h"
8+
#include "port.h"
99
#include "ice_lib.h"
1010
#include "ice_fltr.h"
1111

drivers/net/ethernet/intel/ice/ice_eswitch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define _ICE_ESWITCH_H_
66

77
#include <net/devlink.h>
8-
#include "devlink/devlink_port.h"
8+
#include "devlink/port.h"
99

1010
#ifdef CONFIG_ICE_SWITCHDEV
1111
void ice_eswitch_detach_vf(struct ice_pf *pf, struct ice_vf *vf);

drivers/net/ethernet/intel/ice/ice_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "ice_dcb_lib.h"
1515
#include "ice_dcb_nl.h"
1616
#include "devlink/devlink.h"
17-
#include "devlink/devlink_port.h"
17+
#include "devlink/port.h"
1818
#include "ice_sf_eth.h"
1919
#include "ice_hwmon.h"
2020
/* Including ice_trace.h with CREATE_TRACE_POINTS defined will generate the

drivers/net/ethernet/intel/ice/ice_repr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "ice.h"
55
#include "ice_eswitch.h"
66
#include "devlink/devlink.h"
7-
#include "devlink/devlink_port.h"
7+
#include "devlink/port.h"
88
#include "ice_sriov.h"
99
#include "ice_tc_lib.h"
1010
#include "ice_dcb_lib.h"

drivers/net/ethernet/intel/ice/ice_sf_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include "ice_txrx.h"
66
#include "ice_fltr.h"
77
#include "ice_sf_eth.h"
8-
#include "devlink/devlink_port.h"
98
#include "devlink/devlink.h"
9+
#include "devlink/port.h"
1010

1111
static const struct net_device_ops ice_sf_netdev_ops = {
1212
.ndo_open = ice_open,

0 commit comments

Comments
 (0)