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:
Joe Perches
committed by
Michael Grzeschik
Michael Grzeschik
parent
37587fadff
commit
cb334648a1
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Linux ARCnet driver - COM20020 PCMCIA support
|
||||
*
|
||||
*
|
||||
* Written 1994-1999 by Avery Pennarun,
|
||||
* based on an ISA version by David Woodhouse.
|
||||
* Derived from ibmtr_cs.c by Steve Kipisz (pcmcia-cs 3.1.4)
|
||||
@@ -19,14 +19,14 @@
|
||||
* Director, National Security Agency. This software may only be used
|
||||
* and distributed according to the terms of the GNU General Public License as
|
||||
* modified by SRC, incorporated herein by reference.
|
||||
*
|
||||
*
|
||||
* **********************
|
||||
* Changes:
|
||||
* Arnaldo Carvalho de Melo <acme@conectiva.com.br> - 08/08/2000
|
||||
* - reorganize kmallocs in com20020_attach, checking all for failure
|
||||
* and releasing the previous allocations if one fails
|
||||
* **********************
|
||||
*
|
||||
*
|
||||
* For more details, see drivers/net/arcnet.c
|
||||
*
|
||||
* **********************
|
||||
@@ -53,33 +53,33 @@
|
||||
static void regdump(struct net_device *dev)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
int ioaddr = dev->base_addr;
|
||||
int count;
|
||||
|
||||
netdev_dbg(dev, "register dump:\n");
|
||||
for (count = ioaddr; count < ioaddr + 16; count++)
|
||||
{
|
||||
if (!(count % 16))
|
||||
pr_cont("%04X:", count);
|
||||
pr_cont(" %02X", inb(count));
|
||||
}
|
||||
pr_cont("\n");
|
||||
|
||||
netdev_dbg(dev, "buffer0 dump:\n");
|
||||
int ioaddr = dev->base_addr;
|
||||
int count;
|
||||
|
||||
netdev_dbg(dev, "register dump:\n");
|
||||
for (count = ioaddr; count < ioaddr + 16; count++)
|
||||
{
|
||||
if (!(count % 16))
|
||||
pr_cont("%04X:", count);
|
||||
pr_cont(" %02X", inb(count));
|
||||
}
|
||||
pr_cont("\n");
|
||||
|
||||
netdev_dbg(dev, "buffer0 dump:\n");
|
||||
/* set up the address register */
|
||||
count = 0;
|
||||
count = 0;
|
||||
outb((count >> 8) | RDDATAflag | AUTOINCflag, _ADDR_HI);
|
||||
outb(count & 0xff, _ADDR_LO);
|
||||
|
||||
for (count = 0; count < 256+32; count++)
|
||||
{
|
||||
if (!(count % 16))
|
||||
pr_cont("%04X:", count);
|
||||
|
||||
/* copy the data */
|
||||
pr_cont(" %02X", inb(_MEMDATA));
|
||||
}
|
||||
pr_cont("\n");
|
||||
|
||||
for (count = 0; count < 256 + 32; count++)
|
||||
{
|
||||
if (!(count % 16))
|
||||
pr_cont("%04X:", count);
|
||||
|
||||
/* copy the data */
|
||||
pr_cont(" %02X", inb(_MEMDATA));
|
||||
}
|
||||
pr_cont("\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -114,169 +114,169 @@ static void com20020_detach(struct pcmcia_device *p_dev);
|
||||
|
||||
static int com20020_probe(struct pcmcia_device *p_dev)
|
||||
{
|
||||
struct com20020_dev *info;
|
||||
struct net_device *dev;
|
||||
struct arcnet_local *lp;
|
||||
struct com20020_dev *info;
|
||||
struct net_device *dev;
|
||||
struct arcnet_local *lp;
|
||||
|
||||
dev_dbg(&p_dev->dev, "com20020_attach()\n");
|
||||
dev_dbg(&p_dev->dev, "com20020_attach()\n");
|
||||
|
||||
/* Create new network device */
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
if (!info)
|
||||
goto fail_alloc_info;
|
||||
/* Create new network device */
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
if (!info)
|
||||
goto fail_alloc_info;
|
||||
|
||||
dev = alloc_arcdev("");
|
||||
if (!dev)
|
||||
goto fail_alloc_dev;
|
||||
dev = alloc_arcdev("");
|
||||
if (!dev)
|
||||
goto fail_alloc_dev;
|
||||
|
||||
lp = netdev_priv(dev);
|
||||
lp->timeout = timeout;
|
||||
lp->backplane = backplane;
|
||||
lp->clockp = clockp;
|
||||
lp->clockm = clockm & 3;
|
||||
lp->hw.owner = THIS_MODULE;
|
||||
lp = netdev_priv(dev);
|
||||
lp->timeout = timeout;
|
||||
lp->backplane = backplane;
|
||||
lp->clockp = clockp;
|
||||
lp->clockm = clockm & 3;
|
||||
lp->hw.owner = THIS_MODULE;
|
||||
|
||||
/* fill in our module parameters as defaults */
|
||||
dev->dev_addr[0] = node;
|
||||
/* fill in our module parameters as defaults */
|
||||
dev->dev_addr[0] = node;
|
||||
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->config_flags |= CONF_ENABLE_IRQ;
|
||||
p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
|
||||
p_dev->resource[0]->end = 16;
|
||||
p_dev->config_flags |= CONF_ENABLE_IRQ;
|
||||
|
||||
info->dev = dev;
|
||||
p_dev->priv = info;
|
||||
info->dev = dev;
|
||||
p_dev->priv = info;
|
||||
|
||||
return com20020_config(p_dev);
|
||||
return com20020_config(p_dev);
|
||||
|
||||
fail_alloc_dev:
|
||||
kfree(info);
|
||||
kfree(info);
|
||||
fail_alloc_info:
|
||||
return -ENOMEM;
|
||||
return -ENOMEM;
|
||||
} /* com20020_attach */
|
||||
|
||||
static void com20020_detach(struct pcmcia_device *link)
|
||||
{
|
||||
struct com20020_dev *info = link->priv;
|
||||
struct net_device *dev = info->dev;
|
||||
struct com20020_dev *info = link->priv;
|
||||
struct net_device *dev = info->dev;
|
||||
|
||||
dev_dbg(&link->dev, "detach...\n");
|
||||
dev_dbg(&link->dev, "detach...\n");
|
||||
|
||||
dev_dbg(&link->dev, "com20020_detach\n");
|
||||
dev_dbg(&link->dev, "com20020_detach\n");
|
||||
|
||||
dev_dbg(&link->dev, "unregister...\n");
|
||||
dev_dbg(&link->dev, "unregister...\n");
|
||||
|
||||
unregister_netdev(dev);
|
||||
unregister_netdev(dev);
|
||||
|
||||
/*
|
||||
* this is necessary because we register our IRQ separately
|
||||
* from card services.
|
||||
*/
|
||||
if (dev->irq)
|
||||
free_irq(dev->irq, dev);
|
||||
/*
|
||||
* this is necessary because we register our IRQ separately
|
||||
* from card services.
|
||||
*/
|
||||
if (dev->irq)
|
||||
free_irq(dev->irq, dev);
|
||||
|
||||
com20020_release(link);
|
||||
com20020_release(link);
|
||||
|
||||
/* Unlink device structure, free bits */
|
||||
dev_dbg(&link->dev, "unlinking...\n");
|
||||
if (link->priv)
|
||||
{
|
||||
dev = info->dev;
|
||||
if (dev)
|
||||
/* Unlink device structure, free bits */
|
||||
dev_dbg(&link->dev, "unlinking...\n");
|
||||
if (link->priv)
|
||||
{
|
||||
dev_dbg(&link->dev, "kfree...\n");
|
||||
free_netdev(dev);
|
||||
dev = info->dev;
|
||||
if (dev)
|
||||
{
|
||||
dev_dbg(&link->dev, "kfree...\n");
|
||||
free_netdev(dev);
|
||||
}
|
||||
dev_dbg(&link->dev, "kfree2...\n");
|
||||
kfree(info);
|
||||
}
|
||||
dev_dbg(&link->dev, "kfree2...\n");
|
||||
kfree(info);
|
||||
}
|
||||
|
||||
} /* com20020_detach */
|
||||
|
||||
static int com20020_config(struct pcmcia_device *link)
|
||||
{
|
||||
struct arcnet_local *lp;
|
||||
struct com20020_dev *info;
|
||||
struct net_device *dev;
|
||||
int i, ret;
|
||||
int ioaddr;
|
||||
struct arcnet_local *lp;
|
||||
struct com20020_dev *info;
|
||||
struct net_device *dev;
|
||||
int i, ret;
|
||||
int ioaddr;
|
||||
|
||||
info = link->priv;
|
||||
dev = info->dev;
|
||||
info = link->priv;
|
||||
dev = info->dev;
|
||||
|
||||
dev_dbg(&link->dev, "config...\n");
|
||||
dev_dbg(&link->dev, "config...\n");
|
||||
|
||||
dev_dbg(&link->dev, "com20020_config\n");
|
||||
dev_dbg(&link->dev, "com20020_config\n");
|
||||
|
||||
dev_dbg(&link->dev, "baseport1 is %Xh\n",
|
||||
(unsigned int) link->resource[0]->start);
|
||||
dev_dbg(&link->dev, "baseport1 is %Xh\n",
|
||||
(unsigned int)link->resource[0]->start);
|
||||
|
||||
i = -ENODEV;
|
||||
link->io_lines = 16;
|
||||
i = -ENODEV;
|
||||
link->io_lines = 16;
|
||||
|
||||
if (!link->resource[0]->start)
|
||||
{
|
||||
for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
|
||||
if (!link->resource[0]->start)
|
||||
{
|
||||
link->resource[0]->start = ioaddr;
|
||||
i = pcmcia_request_io(link);
|
||||
if (i == 0)
|
||||
break;
|
||||
for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
|
||||
{
|
||||
link->resource[0]->start = ioaddr;
|
||||
i = pcmcia_request_io(link);
|
||||
if (i == 0)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
i = pcmcia_request_io(link);
|
||||
|
||||
if (i != 0)
|
||||
{
|
||||
dev_dbg(&link->dev, "requestIO failed totally!\n");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
ioaddr = dev->base_addr = link->resource[0]->start;
|
||||
dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr);
|
||||
else
|
||||
i = pcmcia_request_io(link);
|
||||
|
||||
dev_dbg(&link->dev, "request IRQ %d\n",
|
||||
link->irq);
|
||||
if (!link->irq)
|
||||
{
|
||||
dev_dbg(&link->dev, "requestIRQ failed totally!\n");
|
||||
goto failed;
|
||||
}
|
||||
if (i != 0)
|
||||
{
|
||||
dev_dbg(&link->dev, "requestIO failed totally!\n");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
dev->irq = link->irq;
|
||||
ioaddr = dev->base_addr = link->resource[0]->start;
|
||||
dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr);
|
||||
|
||||
ret = pcmcia_enable_device(link);
|
||||
if (ret)
|
||||
goto failed;
|
||||
dev_dbg(&link->dev, "request IRQ %d\n",
|
||||
link->irq);
|
||||
if (!link->irq)
|
||||
{
|
||||
dev_dbg(&link->dev, "requestIRQ failed totally!\n");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
if (com20020_check(dev))
|
||||
{
|
||||
regdump(dev);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
lp = netdev_priv(dev);
|
||||
lp->card_name = "PCMCIA COM20020";
|
||||
lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
|
||||
dev->irq = link->irq;
|
||||
|
||||
SET_NETDEV_DEV(dev, &link->dev);
|
||||
ret = pcmcia_enable_device(link);
|
||||
if (ret)
|
||||
goto failed;
|
||||
|
||||
i = com20020_found(dev, 0); /* calls register_netdev */
|
||||
|
||||
if (i != 0) {
|
||||
dev_notice(&link->dev,
|
||||
"com20020_found() failed\n");
|
||||
goto failed;
|
||||
}
|
||||
if (com20020_check(dev))
|
||||
{
|
||||
regdump(dev);
|
||||
goto failed;
|
||||
}
|
||||
|
||||
netdev_dbg(dev, "port %#3lx, irq %d\n",
|
||||
dev->base_addr, dev->irq);
|
||||
return 0;
|
||||
lp = netdev_priv(dev);
|
||||
lp->card_name = "PCMCIA COM20020";
|
||||
lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
|
||||
|
||||
SET_NETDEV_DEV(dev, &link->dev);
|
||||
|
||||
i = com20020_found(dev, 0); /* calls register_netdev */
|
||||
|
||||
if (i != 0) {
|
||||
dev_notice(&link->dev,
|
||||
"com20020_found() failed\n");
|
||||
goto failed;
|
||||
}
|
||||
|
||||
netdev_dbg(dev, "port %#3lx, irq %d\n",
|
||||
dev->base_addr, dev->irq);
|
||||
return 0;
|
||||
|
||||
failed:
|
||||
dev_dbg(&link->dev, "com20020_config failed...\n");
|
||||
com20020_release(link);
|
||||
return -ENODEV;
|
||||
dev_dbg(&link->dev, "com20020_config failed...\n");
|
||||
com20020_release(link);
|
||||
return -ENODEV;
|
||||
} /* com20020_config */
|
||||
|
||||
static void com20020_release(struct pcmcia_device *link)
|
||||
@@ -312,9 +312,9 @@ static int com20020_resume(struct pcmcia_device *link)
|
||||
|
||||
static const struct pcmcia_device_id com20020_ids[] = {
|
||||
PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",
|
||||
"PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
|
||||
"PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
|
||||
PCMCIA_DEVICE_PROD_ID12("SoHard AG",
|
||||
"SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
|
||||
"SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
|
||||
PCMCIA_DEVICE_NULL
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pcmcia, com20020_ids);
|
||||
|
||||
Reference in New Issue
Block a user