hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/staging/octeon/ethernet-rgmii.c
....@@ -12,18 +12,10 @@
1212 #include <linux/ratelimit.h>
1313 #include <net/dst.h>
1414
15
-#include <asm/octeon/octeon.h>
16
-
17
-#include "ethernet-defines.h"
1815 #include "octeon-ethernet.h"
16
+#include "ethernet-defines.h"
1917 #include "ethernet-util.h"
2018 #include "ethernet-mdio.h"
21
-
22
-#include <asm/octeon/cvmx-helper.h>
23
-
24
-#include <asm/octeon/cvmx-ipd-defs.h>
25
-#include <asm/octeon/cvmx-npi-defs.h>
26
-#include <asm/octeon/cvmx-gmxx-defs.h>
2719
2820 static DEFINE_SPINLOCK(global_register_lock);
2921
....@@ -61,7 +53,7 @@
6153 static void cvm_oct_check_preamble_errors(struct net_device *dev)
6254 {
6355 struct octeon_ethernet *priv = netdev_priv(dev);
64
- cvmx_helper_link_info_t link_info;
56
+ union cvmx_helper_link_info link_info;
6557 unsigned long flags;
6658
6759 link_info.u64 = priv->link_info;
....@@ -111,7 +103,7 @@
111103 static void cvm_oct_rgmii_poll(struct net_device *dev)
112104 {
113105 struct octeon_ethernet *priv = netdev_priv(dev);
114
- cvmx_helper_link_info_t link_info;
106
+ union cvmx_helper_link_info link_info;
115107 bool status_change;
116108
117109 link_info = cvmx_helper_link_get(priv->port);