summaryrefslogtreecommitdiff
path: root/drivers/net/arcnet/com20020_cs.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-05-05 10:05:49 -0700
committerMichael Grzeschik <m.grzeschik@pengutronix.de>2015-09-23 08:44:23 +0200
commit7f5e760c1b269044a4ba1b269263beca80ae2741 (patch)
tree0dd375faf8641f80967c456e1ff3fbdda86c1771 /drivers/net/arcnet/com20020_cs.c
parent01a1d5ac4e1a5890fd6c0d0ae900e1b6e4f851d6 (diff)
arcnet: Use normal kernel brace style
Move braces normal kernel locations. Add missing braces. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Diffstat (limited to 'drivers/net/arcnet/com20020_cs.c')
-rw-r--r--drivers/net/arcnet/com20020_cs.c31
1 files changed, 11 insertions, 20 deletions
diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index 2eafb298626b..532410bb3dd8 100644
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -56,8 +56,7 @@ static void regdump(struct net_device *dev)
int count;
netdev_dbg(dev, "register dump:\n");
- for (count = ioaddr; count < ioaddr + 16; count++)
- {
+ for (count = ioaddr; count < ioaddr + 16; count++) {
if (!(count % 16))
pr_cont("%04X:", count);
pr_cont(" %02X", inb(count));
@@ -70,8 +69,7 @@ static void regdump(struct net_device *dev)
outb((count >> 8) | RDDATAflag | AUTOINCflag, _ADDR_HI);
outb(count & 0xff, _ADDR_LO);
- for (count = 0; count < 256 + 32; count++)
- {
+ for (count = 0; count < 256 + 32; count++) {
if (!(count % 16))
pr_cont("%04X:", count);
@@ -175,11 +173,9 @@ static void com20020_detach(struct pcmcia_device *link)
/* Unlink device structure, free bits */
dev_dbg(&link->dev, "unlinking...\n");
- if (link->priv)
- {
+ if (link->priv) {
dev = info->dev;
- if (dev)
- {
+ if (dev) {
dev_dbg(&link->dev, "kfree...\n");
free_netdev(dev);
}
@@ -210,21 +206,18 @@ static int com20020_config(struct pcmcia_device *link)
i = -ENODEV;
link->io_lines = 16;
- if (!link->resource[0]->start)
- {
- for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
- {
+ if (!link->resource[0]->start) {
+ for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10) {
link->resource[0]->start = ioaddr;
i = pcmcia_request_io(link);
if (i == 0)
break;
}
- }
- else
+ } else {
i = pcmcia_request_io(link);
+ }
- if (i != 0)
- {
+ if (i != 0) {
dev_dbg(&link->dev, "requestIO failed totally!\n");
goto failed;
}
@@ -234,8 +227,7 @@ static int com20020_config(struct pcmcia_device *link)
dev_dbg(&link->dev, "request IRQ %d\n",
link->irq);
- if (!link->irq)
- {
+ if (!link->irq) {
dev_dbg(&link->dev, "requestIRQ failed totally!\n");
goto failed;
}
@@ -246,8 +238,7 @@ static int com20020_config(struct pcmcia_device *link)
if (ret)
goto failed;
- if (com20020_check(dev))
- {
+ if (com20020_check(dev)) {
regdump(dev);
goto failed;
}