Skip to content

Commit 2e5396b

Browse files
Roman Yeryomindavem330
Roman Yeryomin
authored and
davem330
committed
net: korina: whitespace cleanup
Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 247c78f commit 2e5396b

File tree

1 file changed

+31
-27
lines changed

1 file changed

+31
-27
lines changed

‎drivers/net/ethernet/korina.c

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
#include <asm/mach-rc32434/eth.h>
6565
#include <asm/mach-rc32434/dma_v.h>
6666

67-
#define DRV_NAME "korina"
68-
#define DRV_VERSION "0.10"
69-
#define DRV_RELDATE "04Mar2008"
67+
#define DRV_NAME "korina"
68+
#define DRV_VERSION "0.10"
69+
#define DRV_RELDATE "04Mar2008"
7070

7171
#define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \
7272
((dev)->dev_addr[1]))
@@ -75,7 +75,7 @@
7575
((dev)->dev_addr[4] << 8) | \
7676
((dev)->dev_addr[5]))
7777

78-
#define MII_CLOCK 1250000 /* no more than 2.5MHz */
78+
#define MII_CLOCK 1250000 /* no more than 2.5MHz */
7979

8080
/* the following must be powers of two */
8181
#define KORINA_NUM_RDS 64 /* number of receive descriptors */
@@ -87,15 +87,19 @@
8787
#define KORINA_RBSIZE 1536 /* size of one resource buffer = Ether MTU */
8888
#define KORINA_RDS_MASK (KORINA_NUM_RDS - 1)
8989
#define KORINA_TDS_MASK (KORINA_NUM_TDS - 1)
90-
#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc))
90+
#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc))
9191
#define TD_RING_SIZE (KORINA_NUM_TDS * sizeof(struct dma_desc))
9292

93-
#define TX_TIMEOUT (6000 * HZ / 1000)
93+
#define TX_TIMEOUT (6000 * HZ / 1000)
9494

95-
enum chain_status { desc_filled, desc_empty };
96-
#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0)
97-
#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0)
98-
#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT)
95+
enum chain_status {
96+
desc_filled,
97+
desc_empty
98+
};
99+
100+
#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0)
101+
#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0)
102+
#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT)
99103

100104
/* Information that need to be kept for each board. */
101105
struct korina_private {
@@ -123,7 +127,7 @@ struct korina_private {
123127
int rx_irq;
124128
int tx_irq;
125129

126-
spinlock_t lock; /* NIC xmit lock */
130+
spinlock_t lock; /* NIC xmit lock */
127131

128132
int dma_halt_cnt;
129133
int dma_run_cnt;
@@ -146,17 +150,17 @@ static inline void korina_start_dma(struct dma_reg *ch, u32 dma_addr)
146150
static inline void korina_abort_dma(struct net_device *dev,
147151
struct dma_reg *ch)
148152
{
149-
if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) {
150-
writel(0x10, &ch->dmac);
153+
if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) {
154+
writel(0x10, &ch->dmac);
151155

152-
while (!(readl(&ch->dmas) & DMA_STAT_HALT))
153-
netif_trans_update(dev);
156+
while (!(readl(&ch->dmas) & DMA_STAT_HALT))
157+
netif_trans_update(dev);
154158

155-
writel(0, &ch->dmas);
156-
}
159+
writel(0, &ch->dmas);
160+
}
157161

158-
writel(0, &ch->dmadptr);
159-
writel(0, &ch->dmandptr);
162+
writel(0, &ch->dmadptr);
163+
writel(0, &ch->dmandptr);
160164
}
161165

162166
static inline void korina_chain_dma(struct dma_reg *ch, u32 dma_addr)
@@ -685,7 +689,7 @@ static int korina_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
685689

686690
/* ethtool helpers */
687691
static void netdev_get_drvinfo(struct net_device *dev,
688-
struct ethtool_drvinfo *info)
692+
struct ethtool_drvinfo *info)
689693
{
690694
struct korina_private *lp = netdev_priv(dev);
691695

@@ -728,10 +732,10 @@ static u32 netdev_get_link(struct net_device *dev)
728732
}
729733

730734
static const struct ethtool_ops netdev_ethtool_ops = {
731-
.get_drvinfo = netdev_get_drvinfo,
732-
.get_link = netdev_get_link,
733-
.get_link_ksettings = netdev_get_link_ksettings,
734-
.set_link_ksettings = netdev_set_link_ksettings,
735+
.get_drvinfo = netdev_get_drvinfo,
736+
.get_link = netdev_get_link,
737+
.get_link_ksettings = netdev_get_link_ksettings,
738+
.set_link_ksettings = netdev_set_link_ksettings,
735739
};
736740

737741
static int korina_alloc_ring(struct net_device *dev)
@@ -863,7 +867,7 @@ static int korina_init(struct net_device *dev)
863867
/* Management Clock Prescaler Divisor
864868
* Clock independent setting */
865869
writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1,
866-
&lp->eth_regs->ethmcp);
870+
&lp->eth_regs->ethmcp);
867871

868872
/* don't transmit until fifo contains 48b */
869873
writel(48, &lp->eth_regs->ethfifott);
@@ -946,14 +950,14 @@ static int korina_open(struct net_device *dev)
946950
0, "Korina ethernet Rx", dev);
947951
if (ret < 0) {
948952
printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n",
949-
dev->name, lp->rx_irq);
953+
dev->name, lp->rx_irq);
950954
goto err_release;
951955
}
952956
ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt,
953957
0, "Korina ethernet Tx", dev);
954958
if (ret < 0) {
955959
printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n",
956-
dev->name, lp->tx_irq);
960+
dev->name, lp->tx_irq);
957961
goto err_free_rx_irq;
958962
}
959963

0 commit comments

Comments
 (0)