Commit 945e659d authored by Radhey Shyam Pandey's avatar Radhey Shyam Pandey Committed by David S. Miller

net: emaclite: Fix coding style

Make coding style changes to fix checkpatch script warnings.
There is no functional change. Fixes below check and warnings-

CHECK: Blank lines aren't necessary after an open brace '{'
CHECK: spinlock_t definition without comment
CHECK: Please don't use multiple blank lines
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
CHECK: braces {} should be used on all arms of this statement
CHECK: Unbalanced braces around else statement
CHECK: Alignment should match open parenthesis
WARNING: Missing a blank line after declarations
Signed-off-by: default avatarRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81669e7c
// SPDX-License-Identifier: GPL-2.0-or-later // 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 * This is a new flat driver which is based on the original emac_lite
* driver from John Williams <john.williams@xilinx.com>. * driver from John Williams <john.williams@xilinx.com>.
...@@ -91,8 +90,6 @@ ...@@ -91,8 +90,6 @@
#define XEL_ARP_PACKET_SIZE 28 /* Max ARP packet size */ #define XEL_ARP_PACKET_SIZE 28 /* Max ARP packet size */
#define XEL_HEADER_IP_LENGTH_OFFSET 16 /* IP Length Offset */ #define XEL_HEADER_IP_LENGTH_OFFSET 16 /* IP Length Offset */
#define TX_TIMEOUT (60 * HZ) /* Tx timeout is 60 seconds. */ #define TX_TIMEOUT (60 * HZ) /* Tx timeout is 60 seconds. */
#define ALIGNMENT 4 #define ALIGNMENT 4
...@@ -124,7 +121,6 @@ ...@@ -124,7 +121,6 @@
* @last_link: last link status * @last_link: last link status
*/ */
struct net_local { struct net_local {
struct net_device *ndev; struct net_device *ndev;
bool tx_ping_pong; bool tx_ping_pong;
...@@ -133,7 +129,7 @@ struct net_local { ...@@ -133,7 +129,7 @@ struct net_local {
u32 next_rx_buf_to_use; u32 next_rx_buf_to_use;
void __iomem *base_addr; void __iomem *base_addr;
spinlock_t reset_lock; spinlock_t reset_lock; /* serialize xmit and tx_timeout execution */
struct sk_buff *deferred_skb; struct sk_buff *deferred_skb;
struct phy_device *phy_dev; struct phy_device *phy_dev;
...@@ -144,7 +140,6 @@ struct net_local { ...@@ -144,7 +140,6 @@ struct net_local {
int last_link; int last_link;
}; };
/*************************/ /*************************/
/* EmacLite driver calls */ /* EmacLite driver calls */
/*************************/ /*************************/
...@@ -207,7 +202,7 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata) ...@@ -207,7 +202,7 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata)
* address in the EmacLite device. * address in the EmacLite device.
*/ */
static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr, static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr,
unsigned length) unsigned int length)
{ {
const u16 *from_u16_ptr; const u16 *from_u16_ptr;
u32 align_buffer; u32 align_buffer;
...@@ -265,7 +260,7 @@ static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr, ...@@ -265,7 +260,7 @@ static void xemaclite_aligned_write(const void *src_ptr, u32 *dest_ptr,
* to a 16-bit aligned buffer. * to a 16-bit aligned buffer.
*/ */
static void xemaclite_aligned_read(u32 *src_ptr, u8 *dest_ptr, static void xemaclite_aligned_read(u32 *src_ptr, u8 *dest_ptr,
unsigned length) unsigned int length)
{ {
u16 *to_u16_ptr, *from_u16_ptr; u16 *to_u16_ptr, *from_u16_ptr;
u32 *from_u32_ptr; u32 *from_u32_ptr;
...@@ -330,7 +325,6 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, ...@@ -330,7 +325,6 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET); reg_data = xemaclite_readl(addr + XEL_TSR_OFFSET);
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK | if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
XEL_TSR_XMIT_ACTIVE_MASK)) == 0) { XEL_TSR_XMIT_ACTIVE_MASK)) == 0) {
/* Switch to next buffer if configured */ /* Switch to next buffer if configured */
if (drvdata->tx_ping_pong != 0) if (drvdata->tx_ping_pong != 0)
drvdata->next_tx_buf_to_use ^= XEL_BUFFER_OFFSET; drvdata->next_tx_buf_to_use ^= XEL_BUFFER_OFFSET;
...@@ -346,8 +340,9 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data, ...@@ -346,8 +340,9 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK | if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
XEL_TSR_XMIT_ACTIVE_MASK)) != 0) XEL_TSR_XMIT_ACTIVE_MASK)) != 0)
return -1; /* Buffers were full, return failure */ return -1; /* Buffers were full, return failure */
} else } else {
return -1; /* Buffer was full, return failure */ return -1; /* Buffer was full, return failure */
}
/* Write the frame to the buffer */ /* Write the frame to the buffer */
xemaclite_aligned_write(data, (u32 __force *)addr, byte_count); xemaclite_aligned_write(data, (u32 __force *)addr, byte_count);
...@@ -423,7 +418,6 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) ...@@ -423,7 +418,6 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen)
* or an IP packet or an ARP packet * or an IP packet or an ARP packet
*/ */
if (proto_type > ETH_DATA_LEN) { if (proto_type > ETH_DATA_LEN) {
if (proto_type == ETH_P_IP) { if (proto_type == ETH_P_IP) {
length = ((ntohl(xemaclite_readl(addr + length = ((ntohl(xemaclite_readl(addr +
XEL_HEADER_IP_LENGTH_OFFSET + XEL_HEADER_IP_LENGTH_OFFSET +
...@@ -433,23 +427,25 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen) ...@@ -433,23 +427,25 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data, int maxlen)
length = min_t(u16, length, ETH_DATA_LEN); length = min_t(u16, length, ETH_DATA_LEN);
length += ETH_HLEN + ETH_FCS_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; length = XEL_ARP_PACKET_SIZE + ETH_HLEN + ETH_FCS_LEN;
else } else {
/* Field contains type other than IP or ARP, use max /* Field contains type other than IP or ARP, use max
* frame size and let user parse it * frame size and let user parse it
*/ */
length = ETH_FRAME_LEN + ETH_FCS_LEN; length = ETH_FRAME_LEN + ETH_FCS_LEN;
} else }
} else {
/* Use the length in the frame, plus the header and trailer */ /* Use the length in the frame, plus the header and trailer */
length = proto_type + ETH_HLEN + ETH_FCS_LEN; length = proto_type + ETH_HLEN + ETH_FCS_LEN;
}
if (WARN_ON(length > maxlen)) if (WARN_ON(length > maxlen))
length = maxlen; length = maxlen;
/* Read from the EmacLite device */ /* Read from the EmacLite device */
xemaclite_aligned_read((u32 __force *)(addr + XEL_RXBUFF_OFFSET), xemaclite_aligned_read((u32 __force *)(addr + XEL_RXBUFF_OFFSET),
data, length); data, length);
/* Acknowledge the frame */ /* Acknowledge the frame */
reg_data = xemaclite_readl(addr + XEL_RSR_OFFSET); reg_data = xemaclite_readl(addr + XEL_RSR_OFFSET);
...@@ -671,8 +667,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) ...@@ -671,8 +667,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
/* Check if the Transmission for the first buffer is completed */ /* Check if the Transmission for the first buffer is completed */
tx_status = xemaclite_readl(base_addr + XEL_TSR_OFFSET); tx_status = xemaclite_readl(base_addr + XEL_TSR_OFFSET);
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) && if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK; tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
xemaclite_writel(tx_status, base_addr + XEL_TSR_OFFSET); xemaclite_writel(tx_status, base_addr + XEL_TSR_OFFSET);
...@@ -682,8 +677,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id) ...@@ -682,8 +677,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
/* Check if the Transmission for the second buffer is completed */ /* Check if the Transmission for the second buffer is completed */
tx_status = xemaclite_readl(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET); tx_status = xemaclite_readl(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) && if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) { (tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK; tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
xemaclite_writel(tx_status, base_addr + XEL_BUFFER_OFFSET + xemaclite_writel(tx_status, base_addr + XEL_BUFFER_OFFSET +
XEL_TSR_OFFSET); XEL_TSR_OFFSET);
...@@ -840,6 +834,7 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev) ...@@ -840,6 +834,7 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
of_address_to_resource(npp, 0, &res); of_address_to_resource(npp, 0, &res);
if (lp->ndev->mem_start != res.start) { if (lp->ndev->mem_start != res.start) {
struct phy_device *phydev; struct phy_device *phydev;
phydev = of_phy_find_device(lp->phy_node); phydev = of_phy_find_device(lp->phy_node);
if (!phydev) if (!phydev)
dev_info(dev, dev_info(dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment