Commit ec2c398e authored by Aybuke Ozdemir's avatar Aybuke Ozdemir Committed by Greg Kroah-Hartman
Browse files

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: default avatarAybuke Ozdemir <aybuke.147@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f6347ef

drivers/staging/octeon/ethernet-defines.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/octeon/ethernet-rx.c

+4 −4
Original line number Diff line number Diff line
@@ -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)) {

					/*

drivers/staging/octeon/ethernet-tx.c

+3 −3
Original line number Diff line number Diff line
@@ -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;



	/*

drivers/staging/octeon/ethernet.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

			}

drivers/staging/octeon/octeon-ethernet.h

+1 −1
Original line number Diff line number Diff line
@@ -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;