Commit 48b48b65 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'emaclite-cleanups' 



Radhey Shyam Pandey says:

====================
net: emaclite: Trivial code cleanup

This patchset fix coding style issues, remove BUFFER_ALIGN
macro and also update copyright text.

I have to resend as earlier series didn't reach mailing list
due to some configuration issue.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 81669e7c 7240bf6f

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+18 −37
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Xilinx EmacLite Linux driver for the Xilinx Ethernet MAC Lite device.

/* Xilinx EmacLite Linux driver for the Xilinx Ethernet MAC Lite device.

 *

 * This is a new flat driver which is based on the original emac_lite

 * driver from John Williams <john.williams@xilinx.com>.

 *

 * 2007 - 2013 (c) Xilinx, Inc.

 * Copyright (c) 2007 - 2013 Xilinx, Inc.

 */



#include <linux/module.h>
@@ -91,13 +90,7 @@ 
#define XEL_ARP_PACKET_SIZE		28	/* Max ARP packet size */

#define XEL_HEADER_IP_LENGTH_OFFSET	16	/* IP Length Offset */







#define TX_TIMEOUT		(60 * HZ)	/* Tx timeout is 60 seconds. */

#define ALIGNMENT		4



/* BUFFER_ALIGN(adr) calculates the number of bytes to the next alignment. */

#define BUFFER_ALIGN(adr) ((ALIGNMENT - ((uintptr_t)adr)) % ALIGNMENT)



#ifdef __BIG_ENDIAN

#define xemaclite_readl		ioread32be
@@ -124,7 +117,6 @@ 
 * @last_link:		last link status

 */

struct net_local {



	struct net_device *ndev;



	bool tx_ping_pong;
@@ -133,7 +125,7 @@ struct net_local { 
	u32 next_rx_buf_to_use;

	void __iomem *base_addr;



	spinlock_t reset_lock;

	spinlock_t reset_lock; /* serialize xmit and tx_timeout execution */

	struct sk_buff *deferred_skb;



	struct phy_device *phy_dev;
@@ -144,7 +136,6 @@ struct net_local { 
	int last_link;

};





/*************************/

/* EmacLite driver calls */

/*************************/
@@ -207,7 +198,7 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata) 
 * address in the EmacLite device.

 */

static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr,

				    unsigned length)

				    unsigned int length)

{

	const u16 *from_u16_ptr;

	u32 align_buffer;
@@ -265,7 +256,7 @@ static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr, 
 * to a 16-bit aligned buffer.

 */

static void xemaclite_aligned_read(u32 *src_ptr, u8 *dest_ptr,

				   unsigned length)

				   unsigned int length)

{

	u16 *to_u16_ptr, *from_u16_ptr;

	u32 *from_u32_ptr;
@@ -330,7 +321,6 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, 
	reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET);

	if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |

	     XEL_TSR_XMIT_ACTIVE_MASK)) == 0) {



		/* Switch to next buffer if configured */

		if (drvdata->tx_ping_pong != 0)

			drvdata->next_tx_buf_to_use ^= XEL_BUFFER_OFFSET;
@@ -346,8 +336,9 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, 
		if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |

		     XEL_TSR_XMIT_ACTIVE_MASK)) != 0)

			return -1; /* Buffers were full, return failure */

	} else

	} else {

		return -1; /* Buffer was full, return failure */

	}



	/* Write the frame to the buffer */

	xemaclite_aligned_write(data, (u32 __force *)addr, byte_count);
@@ -423,7 +414,6 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) 
	 * or an IP packet or an ARP packet

	 */

	if (proto_type > ETH_DATA_LEN) {



		if (proto_type == ETH_P_IP) {

			length = ((ntohl(xemaclite_readl(addr +

					XEL_HEADER_IP_LENGTH_OFFSET +
@@ -433,16 +423,18 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) 
			length = min_t(u16, length, ETH_DATA_LEN);

			length += ETH_HLEN + ETH_FCS_LEN;



		} else if (proto_type == ETH_P_ARP)

		} else if (proto_type == ETH_P_ARP) {

			length = XEL_ARP_PACKET_SIZE + ETH_HLEN + ETH_FCS_LEN;

		else

		} else {

			/* Field contains type other than IP or ARP, use max

			 * frame size and let user parse it

			 */

			length = ETH_FRAME_LEN + ETH_FCS_LEN;

	} else

		}

	} else {

		/* Use the length in the frame, plus the header and trailer */

		length = proto_type + ETH_HLEN + ETH_FCS_LEN;

	}



	if (WARN_ON(length > maxlen))

		length = maxlen;
@@ -599,11 +591,10 @@ static void xemaclite_rx_handler(struct net_device *dev) 
{

	struct net_local *lp = netdev_priv(dev);

	struct sk_buff *skb;

	unsigned int align;

	u32 len;



	len = ETH_FRAME_LEN + ETH_FCS_LEN;

	skb = netdev_alloc_skb(dev, len + ALIGNMENT);

	skb = netdev_alloc_skb(dev, len + NET_IP_ALIGN);

	if (!skb) {

		/* Couldn't get memory. */

		dev->stats.rx_dropped++;
@@ -611,16 +602,7 @@ static void xemaclite_rx_handler(struct net_device *dev) 
		return;

	}



	/* A new skb should have the data halfword aligned, but this code is

	 * here just in case that isn't true. Calculate how many

	 * bytes we should reserve to get the data to start on a word

	 * boundary

	 */

	align = BUFFER_ALIGN(skb->data);

	if (align)

		skb_reserve(skb, align);



	skb_reserve(skb, 2);

	skb_reserve(skb, NET_IP_ALIGN);



	len = xemaclite_recv_data(lp, (u8 *)skb->data, len);
@@ -672,7 +654,6 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) 
	tx_status = xemaclite_readl(base_addr + XEL_TSR_OFFSET);

	if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&

	    (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {



		tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;

		xemaclite_writel(tx_status, base_addr + XEL_TSR_OFFSET);
@@ -683,7 +664,6 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) 
	tx_status = xemaclite_readl(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);

	if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&

	    (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {



		tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;

		xemaclite_writel(tx_status, base_addr + XEL_BUFFER_OFFSET +

				 XEL_TSR_OFFSET);
@@ -840,6 +820,7 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev) 
	of_address_to_resource(npp, 0, &res);

	if (lp->ndev->mem_start != res.start) {

		struct phy_device *phydev;



		phydev = of_phy_find_device(lp->phy_node);

		if (!phydev)

			dev_info(dev,