staging: octeon: remove typedef declaration for cvmx_helper_link_info

Remove declaration of union cvmx_helper_link_info as typedef.
Also replace its previous uses with new union declaration.
Issue found by checkpatch.pl

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Link: https://lore.kernel.org/r/fb373aed8fd2b04d01198f5a5769fd2476714e88.1570821661.git.wambui.karugax@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index ffac0c4b3f5ceb7fab824935f56286204409ee29..c798672d61b2706883a9fad854eb3817171ce126 100644 (file)
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -65,7 +65,7 @@ int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 }
 
 void cvm_oct_note_carrier(struct octeon_ethernet *priv,
-                         cvmx_helper_link_info_t li)
+                         union cvmx_helper_link_info li)
 {
        if (li.s.link_up) {
                pr_notice_ratelimited("%s: %u Mbps %s duplex, port %d, queue %d\n",
@@ -81,7 +81,7 @@ void cvm_oct_note_carrier(struct octeon_ethernet *priv,
 void cvm_oct_adjust_link(struct net_device *dev)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
 
        link_info.u64           = 0;
        link_info.s.link_up     = dev->phydev->link ? 1 : 0;
@@ -106,7 +106,7 @@ int cvm_oct_common_stop(struct net_device *dev)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
        int interface = INTERFACE(priv->port);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
        union cvmx_gmxx_prtx_cfg gmx_cfg;
        int index = INDEX(priv->port);
 

diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c
index d91fd5ce9e68fdfeeef1f2e84172832b18dca14b..0c4fac31540ae6c08b1e7bf18f8e34d82a3231bb 100644 (file)
--- a/drivers/staging/octeon/ethernet-rgmii.c
+++ b/drivers/staging/octeon/ethernet-rgmii.c
@@ -53,7 +53,7 @@ static void cvm_oct_set_hw_preamble(struct octeon_ethernet *priv, bool enable)
 static void cvm_oct_check_preamble_errors(struct net_device *dev)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
        unsigned long flags;
 
        link_info.u64 = priv->link_info;
@@ -103,7 +103,7 @@ static void cvm_oct_check_preamble_errors(struct net_device *dev)
 static void cvm_oct_rgmii_poll(struct net_device *dev)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
        bool status_change;
 
        link_info = cvmx_helper_link_get(priv->port);

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index f892f1ad4638011897350b89535cf23d44acf4d6..f42c3816ce491393c0b4fdc91521b4d405567c48 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -460,7 +460,7 @@ int cvm_oct_common_open(struct net_device *dev,
        struct octeon_ethernet *priv = netdev_priv(dev);
        int interface = INTERFACE(priv->port);
        int index = INDEX(priv->port);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
        int rv;
 
        rv = cvm_oct_phy_setup_device(dev);
@@ -496,7 +496,7 @@ int cvm_oct_common_open(struct net_device *dev,
 void cvm_oct_link_poll(struct net_device *dev)
 {
        struct octeon_ethernet *priv = netdev_priv(dev);
-       cvmx_helper_link_info_t link_info;
+       union cvmx_helper_link_info link_info;
 
        link_info = cvmx_helper_link_get(priv->port);
        if (link_info.u64 == priv->link_info)

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index 042220d86d33d5162da18d4e23b89a569c5a8bc8..a6140705706f49c6d07111761ca157200b32b264 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -91,7 +91,7 @@ int cvm_oct_common_stop(struct net_device *dev);
 int cvm_oct_common_open(struct net_device *dev,
                        void (*link_poll)(struct net_device *));
 void cvm_oct_note_carrier(struct octeon_ethernet *priv,
-                         cvmx_helper_link_info_t li);
+                         union cvmx_helper_link_info li);
 void cvm_oct_link_poll(struct net_device *dev);
 
 extern int always_use_pow;

diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon/octeon-stubs.h
index 0e102aee272b44775a05dfa8990e7f5e164ee884..152b2cbff86aecc8b0cb9c4640e0403de07d5a4c 100644 (file)
--- a/drivers/staging/octeon/octeon-stubs.h
+++ b/drivers/staging/octeon/octeon-stubs.h
@@ -191,7 +191,7 @@ struct cvmx_wqe {
        uint8_t packet_data[96];
 };
 
-typedef union {
+union cvmx_helper_link_info {
        uint64_t u64;
        struct {
                uint64_t reserved_20_63:44;
@@ -199,7 +199,7 @@ typedef union {
                uint64_t full_duplex:1;     /**< 1 if the link is full duplex */
                uint64_t speed:18;          /**< Speed of the link in Mbps */
        } s;
-} cvmx_helper_link_info_t;
+};
 
 typedef enum {
        CVMX_FAU_REG_32_START   = 0,
@@ -1267,15 +1267,15 @@ static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int
        return 0;
 }
 
-static inline cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port)
+static inline union cvmx_helper_link_info cvmx_helper_link_get(int ipd_port)
 {
-       cvmx_helper_link_info_t ret = { .u64 = 0 };
+       union cvmx_helper_link_info ret = { .u64 = 0 };
 
        return ret;
 }
 
 static inline int cvmx_helper_link_set(int ipd_port,
-                               cvmx_helper_link_info_t link_info)
+                                      union cvmx_helper_link_info link_info)
 {
        return 0;
 }