Skip to content

Commit 5385f1e

Browse files
kmaincentPaolo Abeni
authored andcommitted
net: pse-pd: Clean ethtool header of PSE structures
Remove PSE-specific structures from the ethtool header to improve code modularity, maintain independent headers, and reduce incremental build time. Signed-off-by: Kory Maincent <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 10276f3 commit 5385f1e

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

drivers/net/pse-pd/pse_core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
#include <linux/device.h>
9+
#include <linux/ethtool.h>
910
#include <linux/of.h>
1011
#include <linux/pse-pd/pse.h>
1112
#include <linux/regulator/driver.h>

include/linux/ethtool.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,24 +1326,4 @@ struct ethtool_forced_speed_map {
13261326

13271327
void
13281328
ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size);
1329-
1330-
/* C33 PSE extended state and substate. */
1331-
struct ethtool_c33_pse_ext_state_info {
1332-
enum ethtool_c33_pse_ext_state c33_pse_ext_state;
1333-
union {
1334-
enum ethtool_c33_pse_ext_substate_error_condition error_condition;
1335-
enum ethtool_c33_pse_ext_substate_mr_pse_enable mr_pse_enable;
1336-
enum ethtool_c33_pse_ext_substate_option_detect_ted option_detect_ted;
1337-
enum ethtool_c33_pse_ext_substate_option_vport_lim option_vport_lim;
1338-
enum ethtool_c33_pse_ext_substate_ovld_detected ovld_detected;
1339-
enum ethtool_c33_pse_ext_substate_power_not_available power_not_available;
1340-
enum ethtool_c33_pse_ext_substate_short_detected short_detected;
1341-
u32 __c33_pse_ext_substate;
1342-
};
1343-
};
1344-
1345-
struct ethtool_c33_pse_pw_limit_range {
1346-
u32 min;
1347-
u32 max;
1348-
};
13491329
#endif /* _LINUX_ETHTOOL_H */

include/linux/pse-pd/pse.h

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifndef _LINUX_PSE_CONTROLLER_H
66
#define _LINUX_PSE_CONTROLLER_H
77

8-
#include <linux/ethtool.h>
98
#include <linux/list.h>
109
#include <uapi/linux/ethtool.h>
1110

@@ -16,6 +15,27 @@
1615

1716
struct phy_device;
1817
struct pse_controller_dev;
18+
struct netlink_ext_ack;
19+
20+
/* C33 PSE extended state and substate. */
21+
struct ethtool_c33_pse_ext_state_info {
22+
enum ethtool_c33_pse_ext_state c33_pse_ext_state;
23+
union {
24+
enum ethtool_c33_pse_ext_substate_error_condition error_condition;
25+
enum ethtool_c33_pse_ext_substate_mr_pse_enable mr_pse_enable;
26+
enum ethtool_c33_pse_ext_substate_option_detect_ted option_detect_ted;
27+
enum ethtool_c33_pse_ext_substate_option_vport_lim option_vport_lim;
28+
enum ethtool_c33_pse_ext_substate_ovld_detected ovld_detected;
29+
enum ethtool_c33_pse_ext_substate_power_not_available power_not_available;
30+
enum ethtool_c33_pse_ext_substate_short_detected short_detected;
31+
u32 __c33_pse_ext_substate;
32+
};
33+
};
34+
35+
struct ethtool_c33_pse_pw_limit_range {
36+
u32 min;
37+
u32 max;
38+
};
1939

2040
/**
2141
* struct pse_control_config - PSE control/channel configuration.

0 commit comments

Comments
 (0)