lkml.org 
[lkml]   [2022]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/4] net: ethernet: xscale: fix space style issues
Date
Fix all checkpatch issue about space/newlines.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/net/ethernet/xscale/ixp4xx_eth.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 3b0c5f177447..71d36ff7cd1b 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -115,7 +115,6 @@
#define DEFAULT_RX_CNTRL0 RX_CNTRL0_RX_EN
#define DEFAULT_CORE_CNTRL CORE_MDC_EN

-
/* NPE message codes */
#define NPE_GETSTATUS 0x00
#define NPE_EDB_SETPORTADDRESS 0x01
@@ -141,7 +140,6 @@
#define NPE_NOTIFY_MAC_RECOVERY_DONE 0x16
#define NPE_MAC_RECOVERY_START 0x17

-
#ifdef __ARMEB__
typedef struct sk_buff buffer_t;
#define free_buffer dev_kfree_skb
@@ -247,7 +245,6 @@ struct desc {
#endif
};

-
#define rx_desc_phys(port, n) ((port)->desc_tab_phys + \
(n) * sizeof(struct desc))
#define rx_desc_ptr(port, n) (&(port)->desc_tab[n])
@@ -260,6 +257,7 @@ struct desc {
static inline void memcpy_swab32(u32 *dest, u32 *src, int cnt)
{
int i;
+
for (i = 0; i < cnt; i++)
dest[i] = swab32(src[i]);
}
@@ -566,7 +564,6 @@ static void ixp4xx_mdio_remove(void)
mdiobus_free(mdio_bus);
}

-
static void ixp4xx_adjust_link(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
@@ -597,7 +594,6 @@ static void ixp4xx_adjust_link(struct net_device *dev)
dev->name, port->speed, port->duplex ? "full" : "half");
}

-
static inline void debug_pkt(struct net_device *dev, const char *func,
u8 *data, int len)
{
@@ -616,7 +612,6 @@ static inline void debug_pkt(struct net_device *dev, const char *func,
#endif
}

-
static inline void debug_desc(u32 phys, struct desc *desc)
{
#if DEBUG_DESC
@@ -661,7 +656,6 @@ static inline void queue_put_desc(unsigned int queue, u32 phys,
length and queues >= 32 don't support this check anyway. */
}

-
static inline void dma_unmap_tx(struct port *port, struct desc *desc)
{
#ifdef __ARMEB__
@@ -674,7 +668,6 @@ static inline void dma_unmap_tx(struct port *port, struct desc *desc)
#endif
}

-
static void eth_rx_irq(void *pdev)
{
struct net_device *dev = pdev;
@@ -792,7 +785,6 @@ static int eth_poll(struct napi_struct *napi, int budget)
return received; /* not all work done */
}

-
static void eth_txdone_irq(void *unused)
{
u32 phys;
@@ -932,7 +924,6 @@ static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK;
}

-
static void eth_set_mcast_list(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
@@ -976,7 +967,6 @@ static void eth_set_mcast_list(struct net_device *dev)
&port->regs->rx_control[0]);
}

-
static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
{
if (!netif_running(dev))
@@ -1046,7 +1036,6 @@ static const struct ethtool_ops ixp4xx_ethtool_ops = {
.set_link_ksettings = phy_ethtool_set_link_ksettings,
};

-
static int request_queues(struct port *port)
{
int err;
@@ -1157,6 +1146,7 @@ static void destroy_queues(struct port *port)
for (i = 0; i < RX_DESCS; i++) {
struct desc *desc = rx_desc_ptr(port, i);
buffer_t *buff = port->rx_buff_tab[i];
+
if (buff) {
dma_unmap_single(&port->netdev->dev,
desc->data - NET_IP_ALIGN,
@@ -1167,6 +1157,7 @@ static void destroy_queues(struct port *port)
for (i = 0; i < TX_DESCS; i++) {
struct desc *desc = tx_desc_ptr(port, i);
buffer_t *buff = port->tx_buff_tab[i];
+
if (buff) {
dma_unmap_tx(port, desc);
free_buffer(buff);
@@ -1320,6 +1311,7 @@ static int eth_close(struct net_device *dev)
struct desc *desc;
u32 phys;
int n = queue_get_desc(port->plat->txreadyq, port, 1);
+
BUG_ON(n < 0);
desc = tx_desc_ptr(port, n);
phys = tx_desc_phys(port, n);
--
2.35.1
\
 
 \ /
  Last update: 2022-10-05 14:06    [W:0.063 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site