Staging: octeon: Use preferred kernel type

This patch "uint*_t" type instead of "u*" type was used.
checkpatch.pl issue in octeon driver.

Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-defines.h b/drivers/staging/octeon/ethernet-defines.h
index f92e0c478e1686f07f6d72795493eb8cf254c372..716400588af007caa9d7f106af426409436a99cd 100644 (file)
--- a/drivers/staging/octeon/ethernet-defines.h
+++ b/drivers/staging/octeon/ethernet-defines.h
@@ -37,8 +37,8 @@
 /* Maximum number of SKBs to try to free per xmit packet. */
 #define MAX_OUT_QUEUE_DEPTH 1000
 
-#define FAU_TOTAL_TX_TO_CLEAN (CVMX_FAU_REG_END - sizeof(uint32_t))
-#define FAU_NUM_PACKET_BUFFERS_TO_FREE (FAU_TOTAL_TX_TO_CLEAN - sizeof(uint32_t))
+#define FAU_TOTAL_TX_TO_CLEAN (CVMX_FAU_REG_END - sizeof(u32))
+#define FAU_NUM_PACKET_BUFFERS_TO_FREE (FAU_TOTAL_TX_TO_CLEAN - sizeof(u32))
 
 #define TOTAL_NUMBER_OF_PORTS       (CVMX_PIP_NUM_INPUT_PORTS+1)
 

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index d1a33a927f6d1295f3cadaae26ea78d343ecab87..f600247e385a0c0317025c699183fb4eae45b624 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -102,7 +102,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
                    cvmx_read_csr(CVMX_GMXX_RXX_FRM_CTL(index, interface));
                if (gmxx_rxx_frm_ctl.s.pre_chk == 0) {
 
-                       uint8_t *ptr =
+                       u8 *ptr =
                            cvmx_phys_to_ptr(work->packet_ptr.s.addr);
                        int i = 0;
 
@@ -163,8 +163,8 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
 static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
 {
        const int       coreid = cvmx_get_core_num();
-       uint64_t        old_group_mask;
-       uint64_t        old_scratch;
+       u64     old_group_mask;
+       u64     old_scratch;
        int             rx_count = 0;
        int             did_work_request = 0;
        int             packet_not_copied;
@@ -284,7 +284,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
                         * entirely stored in the work entry.
                         */
                        if (unlikely(work->word2.s.bufs == 0)) {
-                               uint8_t *ptr = work->packet_data;
+                               u8 *ptr = work->packet_data;
 
                                if (likely(!work->word2.s.not_IP)) {
                                        /*

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 9e2116f4c9153827a288dfa8a5701d28cecc0b56..3a5d8f53831ce05bf27cfb39fe28eb32784bb721 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -143,8 +143,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        cvmx_pko_command_word0_t pko_command;
        union cvmx_buf_ptr hw_buffer;
-       uint64_t old_scratch;
-       uint64_t old_scratch2;
+       u64 old_scratch;
+       u64 old_scratch2;
        int qos;
        int i;
        enum {QUEUE_CORE, QUEUE_HW, QUEUE_DROP} queue_type;
@@ -576,7 +576,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
         * calculation may add a little extra, but that doesn't
         * hurt.
         */
-       copy_location = packet_buffer + sizeof(uint64_t);
+       copy_location = packet_buffer + sizeof(u64);
        copy_location += ((CVMX_HELPER_FIRST_MBUFF_SKIP + 7) & 0xfff8) + 6;
 
        /*

diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 7274fda0b77b9f4f89939ff3f477d6b25a2a0244..c9183e05615c6e9f6480d92dd03a730cd5430974 100644 (file)
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -382,11 +382,11 @@ static int cvm_oct_set_mac_filter(struct net_device *dev)
            && (cvmx_helper_interface_get_mode(interface) !=
                CVMX_HELPER_INTERFACE_MODE_SPI)) {
                int i;
-               uint8_t *ptr = dev->dev_addr;
-               uint64_t mac = 0;
+               u8 *ptr = dev->dev_addr;
+               u64 mac = 0;
 
                for (i = 0; i < 6; i++)
-                       mac = (mac << 8) | (uint64_t)ptr[i];
+                       mac = (mac << 8) | (u64)ptr[i];
 
                gmx_cfg.u64 =
                    cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface));
@@ -835,7 +835,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
                                cvm_oct_device[priv->port] = dev;
                                fau -=
                                    cvmx_pko_get_num_queues(priv->port) *
-                                   sizeof(uint32_t);
+                                   sizeof(u32);
                                queue_delayed_work(cvm_oct_poll_queue,
                                                &priv->port_periodic_work, HZ);
                        }

diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h
index a242c700bc537ad3c8b4df4478dc56b2f8114973..67f640f1c668d32f6f4648d4b7016f75a48a7c95 100644 (file)
--- a/drivers/staging/octeon/octeon-ethernet.h
+++ b/drivers/staging/octeon/octeon-ethernet.h
@@ -43,7 +43,7 @@ struct octeon_ethernet {
        struct phy_device *phydev;
        unsigned int last_link;
        /* Last negotiated link state */
-       uint64_t link_info;
+       u64 link_info;
        /* Called periodically to check link status */
        void (*poll)(struct net_device *dev);
        struct delayed_work     port_periodic_work;