arcnet: Use normal kernel spacing style
Standardized spacing is easier to read. git diff -w shows no differences. objdiff shows no differences. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
This commit is contained in:

committed by
Michael Grzeschik

parent
37587fadff
commit
cb334648a1
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Linux ARCnet driver - COM20020 chipset support
|
||||
*
|
||||
*
|
||||
* Written 1997 by David Woodhouse.
|
||||
* Written 1994-1999 by Avery Pennarun.
|
||||
* Written 1999 by Martin Mares <mj@ucw.cz>.
|
||||
@@ -108,7 +108,7 @@ int com20020_check(struct net_device *dev)
|
||||
{
|
||||
SET_SUBADR(SUB_SETUP2);
|
||||
outb(lp->setup2, _XREG);
|
||||
|
||||
|
||||
/* must now write the magic "restart operation" command */
|
||||
mdelay(1);
|
||||
outb(0x18, _COMMAND);
|
||||
@@ -117,7 +117,7 @@ int com20020_check(struct net_device *dev)
|
||||
lp->config = 0x21 | (lp->timeout << 3) | (lp->backplane << 2);
|
||||
/* set node ID to 0x42 (but transmitter is disabled, so it's okay) */
|
||||
SETCONF;
|
||||
outb(0x42, ioaddr + BUS_ALIGN*7);
|
||||
outb(0x42, ioaddr + BUS_ALIGN * 7);
|
||||
|
||||
status = ASTATUS();
|
||||
|
||||
@@ -129,7 +129,7 @@ int com20020_check(struct net_device *dev)
|
||||
|
||||
/* Enable TX */
|
||||
outb(0x39, _CONFIG);
|
||||
outb(inb(ioaddr + BUS_ALIGN*8), ioaddr + BUS_ALIGN*7);
|
||||
outb(inb(ioaddr + BUS_ALIGN * 8), ioaddr + BUS_ALIGN * 7);
|
||||
|
||||
ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
|
||||
|
||||
@@ -193,7 +193,7 @@ int com20020_found(struct net_device *dev, int shared)
|
||||
lp->hw.close = com20020_close;
|
||||
|
||||
if (!dev->dev_addr[0])
|
||||
dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN*8); /* FIXME: do this some other way! */
|
||||
dev->dev_addr[0] = inb(ioaddr + BUS_ALIGN * 8); /* FIXME: do this some other way! */
|
||||
|
||||
SET_SUBADR(SUB_SETUP1);
|
||||
outb(lp->setup, _XREG);
|
||||
@@ -202,7 +202,7 @@ int com20020_found(struct net_device *dev, int shared)
|
||||
{
|
||||
SET_SUBADR(SUB_SETUP2);
|
||||
outb(lp->setup2, _XREG);
|
||||
|
||||
|
||||
/* must now write the magic "restart operation" command */
|
||||
mdelay(1);
|
||||
outb(0x18, _COMMAND);
|
||||
@@ -232,7 +232,7 @@ int com20020_found(struct net_device *dev, int shared)
|
||||
BUGMSG(D_NORMAL, "Using extended timeout value of %d.\n", lp->timeout);
|
||||
|
||||
BUGMSG(D_NORMAL, "Using CKP %d - data rate %s.\n",
|
||||
lp->setup >> 1,
|
||||
lp->setup >> 1,
|
||||
clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]);
|
||||
|
||||
if (register_netdev(dev)) {
|
||||
@@ -243,9 +243,9 @@ int com20020_found(struct net_device *dev, int shared)
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
/*
|
||||
* Do a hardware reset on the card, and set up necessary registers.
|
||||
*
|
||||
*
|
||||
* This should be called as little as possible, because it disrupts the
|
||||
* token on the network (causes a RECON) and requires a significant delay.
|
||||
*
|
||||
@@ -258,15 +258,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)
|
||||
u_char inbyte;
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n",
|
||||
__FILE__,__LINE__,__func__,dev,lp,dev->name);
|
||||
__FILE__, __LINE__, __func__, dev, lp, dev->name);
|
||||
BUGMSG(D_INIT, "Resetting %s (status=%02Xh)\n",
|
||||
dev->name, ASTATUS());
|
||||
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
lp->config = TXENcfg | (lp->timeout << 3) | (lp->backplane << 2);
|
||||
/* power-up defaults */
|
||||
SETCONF;
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
|
||||
if (really_reset) {
|
||||
/* reset the card */
|
||||
@@ -274,22 +274,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)
|
||||
mdelay(RESETtime * 2); /* COM20020 seems to be slower sometimes */
|
||||
}
|
||||
/* clear flags & end reset */
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
|
||||
|
||||
/* verify that the ARCnet signature byte is present */
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
|
||||
com20020_copy_from_card(dev, 0, 0, &inbyte, 1);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
if (inbyte != TESTvalue) {
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
BUGMSG(D_NORMAL, "reset failed: TESTvalue not present.\n");
|
||||
return 1;
|
||||
}
|
||||
/* enable extended (512-byte) packets */
|
||||
ACOMMAND(CONFIGcmd | EXTconf);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n",__FILE__,__LINE__,__func__);
|
||||
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
|
||||
|
||||
/* done! return success. */
|
||||
return 0;
|
||||
@@ -299,7 +299,7 @@ static int com20020_reset(struct net_device *dev, int really_reset)
|
||||
static void com20020_setmask(struct net_device *dev, int mask)
|
||||
{
|
||||
u_int ioaddr = dev->base_addr;
|
||||
BUGMSG(D_DURING, "Setting mask to %x at %x\n",mask,ioaddr);
|
||||
BUGMSG(D_DURING, "Setting mask to %x at %x\n", mask, ioaddr);
|
||||
AINTMASK(mask);
|
||||
}
|
||||
|
||||
@@ -315,7 +315,7 @@ static int com20020_status(struct net_device *dev)
|
||||
{
|
||||
u_int ioaddr = dev->base_addr;
|
||||
|
||||
return ASTATUS() + (ADIAGSTATUS()<<8);
|
||||
return ASTATUS() + (ADIAGSTATUS() << 8);
|
||||
}
|
||||
|
||||
static void com20020_close(struct net_device *dev)
|
||||
|
Reference in New Issue
Block a user