Skip to content

L
linux
Commit 01a1d5ac authored by Joe Perches's avatar Joe Perches Committed by Michael Grzeschik
Browse files
Options

arcnet: Add and remove blank lines 

Use a more current kernel line style.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
parent cb334648
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 93 deletions
drivers/net/arcnet/arc-rawmode.c
View file @ 01a1d5ac
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#define VERSION "arcnet: raw mode (`r') encapsulation support loaded.\n" #define VERSION "arcnet: raw mode (`r') encapsulation support loaded.\n"
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length); struct archdr *pkthdr, int length);
static int build_header(struct sk_buff *skb, struct net_device *dev, static int build_header(struct sk_buff *skb, struct net_device *dev,
...@@ -54,7 +53,6 @@ static struct ArcProto rawmode_proto = ...@@ -54,7 +53,6 @@ static struct ArcProto rawmode_proto =
.ack_tx = NULL .ack_tx = NULL
}; };
static int __init arcnet_raw_init(void) static int __init arcnet_raw_init(void)
{ {
int count; int count;
...@@ -83,7 +81,6 @@ module_exit(arcnet_raw_exit); ...@@ -83,7 +81,6 @@ module_exit(arcnet_raw_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* packet receiver */ /* packet receiver */
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length) struct archdr *pkthdr, int length)
...@@ -127,7 +124,6 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -127,7 +124,6 @@ static void rx(struct net_device *dev, int bufnum,
netif_rx(skb); netif_rx(skb);
} }
/* /*
* Create the ARCnet hard/soft headers for raw mode. * Create the ARCnet hard/soft headers for raw mode.
* There aren't any soft headers in raw mode - not even the protocol id. * There aren't any soft headers in raw mode - not even the protocol id.
...@@ -163,7 +159,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -163,7 +159,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
return hdr_size; /* success */ return hdr_size; /* success */
} }
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
int bufnum) int bufnum)
{ {
......
drivers/net/arcnet/arc-rimi.c
View file @ 01a1d5ac
...@@ -36,10 +36,8 @@ ...@@ -36,10 +36,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/arcdevice.h> #include <linux/arcdevice.h>
#define VERSION "arcnet: RIM I (entirely mem-mapped) support\n" #define VERSION "arcnet: RIM I (entirely mem-mapped) support\n"
/* Internal function declarations */ /* Internal function declarations */
static int arcrimi_probe(struct net_device *dev); static int arcrimi_probe(struct net_device *dev);
...@@ -78,7 +76,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse ...@@ -78,7 +76,6 @@ static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offse
#define AINTMASK(msk) writeb((msk), _INTMASK) #define AINTMASK(msk) writeb((msk), _INTMASK)
#define SETCONF() writeb(lp->config, _CONFIG) #define SETCONF() writeb(lp->config, _CONFIG)
/* /*
* We cannot probe for a RIM I card; one reason is I don't know how to reset * We cannot probe for a RIM I card; one reason is I don't know how to reset
* them. In fact, we can't even get their node ID automatically. So, we * them. In fact, we can't even get their node ID automatically. So, we
...@@ -249,7 +246,6 @@ static int __init arcrimi_found(struct net_device *dev) ...@@ -249,7 +246,6 @@ static int __init arcrimi_found(struct net_device *dev)
return -EIO; return -EIO;
} }
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
...@@ -308,15 +304,16 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset, ...@@ -308,15 +304,16 @@ static void arcrimi_copy_to_card(struct net_device *dev, int bufnum, int offset,
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count)); TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
} }
static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offset, static void arcrimi_copy_from_card(struct net_device *dev, int bufnum, int offset,
void *buf, int count) void *buf, int count)
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset; void __iomem *memaddr = lp->mem_start + 0x800 + bufnum * 512 + offset;
TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
} }
...@@ -374,6 +371,7 @@ static void __exit arc_rimi_exit(void) ...@@ -374,6 +371,7 @@ static void __exit arc_rimi_exit(void)
static int __init arcrimi_setup(char *s) static int __init arcrimi_setup(char *s)
{ {
int ints[8]; int ints[8];
s = get_options(s, 8, ints); s = get_options(s, 8, ints);
if (!ints[0]) if (!ints[0])
return 1; return 1;
......
drivers/net/arcnet/arcnet.c
View file @ 01a1d5ac
...@@ -168,7 +168,6 @@ void arcnet_dump_skb(struct net_device *dev, ...@@ -168,7 +168,6 @@ void arcnet_dump_skb(struct net_device *dev,
EXPORT_SYMBOL(arcnet_dump_skb); EXPORT_SYMBOL(arcnet_dump_skb);
#endif #endif
/* /*
* Dump the contents of an ARCnet buffer * Dump the contents of an ARCnet buffer
*/ */
...@@ -206,7 +205,6 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum, ...@@ -206,7 +205,6 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum,
#endif #endif
/* /*
* Unregister a protocol driver from the arc_proto_map. Protocol drivers * Unregister a protocol driver from the arc_proto_map. Protocol drivers
* are responsible for registering themselves, but the unregister routine * are responsible for registering themselves, but the unregister routine
...@@ -229,7 +227,6 @@ void arcnet_unregister_proto(struct ArcProto *proto) ...@@ -229,7 +227,6 @@ void arcnet_unregister_proto(struct ArcProto *proto)
} }
} }
/* /*
* Add a buffer to the queue. Only the interrupt handler is allowed to do * Add a buffer to the queue. Only the interrupt handler is allowed to do
* this, unless interrupts are disabled. * this, unless interrupts are disabled.
...@@ -254,7 +251,6 @@ static void release_arcbuf(struct net_device *dev, int bufnum) ...@@ -254,7 +251,6 @@ static void release_arcbuf(struct net_device *dev, int bufnum)
} }
} }
/* /*
* Get a buffer from the queue. If this returns -1, there are no buffers * Get a buffer from the queue. If this returns -1, there are no buffers
* available. * available.
...@@ -281,7 +277,6 @@ static int get_arcbuf(struct net_device *dev) ...@@ -281,7 +277,6 @@ static int get_arcbuf(struct net_device *dev)
} }
} }
BUGLVL(D_DURING) { BUGLVL(D_DURING) {
BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf); BUGMSG(D_DURING, "get_arcbuf: got #%d; buffer queue is now: ", buf);
for (i = lp->next_buf; i != lp->first_free_buf; i = (i + 1) % 5) for (i = lp->next_buf; i != lp->first_free_buf; i = (i + 1) % 5)
...@@ -293,7 +288,6 @@ static int get_arcbuf(struct net_device *dev) ...@@ -293,7 +288,6 @@ static int get_arcbuf(struct net_device *dev)
return buf; return buf;
} }
static int choose_mtu(void) static int choose_mtu(void)
{ {
int count, mtu = 65535; int count, mtu = 65535;
...@@ -348,6 +342,7 @@ struct net_device *alloc_arcdev(const char *name) ...@@ -348,6 +342,7 @@ struct net_device *alloc_arcdev(const char *name)
arcdev_setup); arcdev_setup);
if (dev) { if (dev) {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
} }
...@@ -380,7 +375,6 @@ int arcnet_open(struct net_device *dev) ...@@ -380,7 +375,6 @@ int arcnet_open(struct net_device *dev)
BUGMSG2(D_PROTO, "\n"); BUGMSG2(D_PROTO, "\n");
} }
BUGMSG(D_INIT, "arcnet_open: resetting card.\n"); BUGMSG(D_INIT, "arcnet_open: resetting card.\n");
/* try to put the card in a defined state - if it fails the first /* try to put the card in a defined state - if it fails the first
...@@ -437,7 +431,6 @@ int arcnet_open(struct net_device *dev) ...@@ -437,7 +431,6 @@ int arcnet_open(struct net_device *dev)
ACOMMAND(CFLAGScmd | RESETclear); ACOMMAND(CFLAGScmd | RESETclear);
} }
BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__); BUGMSG(D_DEBUG, "%s: %d: %s\n", __FILE__, __LINE__, __func__);
/* make sure we're ready to receive IRQ's. */ /* make sure we're ready to receive IRQ's. */
AINTMASK(0); AINTMASK(0);
...@@ -459,7 +452,6 @@ int arcnet_open(struct net_device *dev) ...@@ -459,7 +452,6 @@ int arcnet_open(struct net_device *dev)
return error; return error;
} }
/* The inverse routine to arcnet_open - shuts down the card. */ /* The inverse routine to arcnet_open - shuts down the card. */
int arcnet_close(struct net_device *dev) int arcnet_close(struct net_device *dev)
{ {
...@@ -479,7 +471,6 @@ int arcnet_close(struct net_device *dev) ...@@ -479,7 +471,6 @@ int arcnet_close(struct net_device *dev)
return 0; return 0;
} }
static int arcnet_header(struct sk_buff *skb, struct net_device *dev, static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, const void *daddr, unsigned short type, const void *daddr,
const void *saddr, unsigned len) const void *saddr, unsigned len)
...@@ -498,7 +489,6 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev, ...@@ -498,7 +489,6 @@ static int arcnet_header(struct sk_buff *skb, struct net_device *dev,
BUGMSG(D_NORMAL, "arcnet_header: Yikes! skb->len(%d) != len(%d)!\n", BUGMSG(D_NORMAL, "arcnet_header: Yikes! skb->len(%d) != len(%d)!\n",
skb->len, len); skb->len, len);
/* Type is host order - ? */ /* Type is host order - ? */
if (type == ETH_P_ARCNET) { if (type == ETH_P_ARCNET) {
proto = arc_raw_proto; proto = arc_raw_proto;
...@@ -622,7 +612,6 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb, ...@@ -622,7 +612,6 @@ netdev_tx_t arcnet_send_packet(struct sk_buff *skb,
return retval; /* no need to try again */ return retval; /* no need to try again */
} }
/* /*
* Actually start transmitting a packet that was loaded into a buffer * Actually start transmitting a packet that was loaded into a buffer
* by prepare_tx. This should _only_ be called by the interrupt handler. * by prepare_tx. This should _only_ be called by the interrupt handler.
...@@ -654,7 +643,6 @@ static int go_tx(struct net_device *dev) ...@@ -654,7 +643,6 @@ static int go_tx(struct net_device *dev)
return 1; return 1;
} }
/* Called by the kernel when transmit times out */ /* Called by the kernel when transmit times out */
void arcnet_timeout(struct net_device *dev) void arcnet_timeout(struct net_device *dev)
{ {
...@@ -691,7 +679,6 @@ void arcnet_timeout(struct net_device *dev) ...@@ -691,7 +679,6 @@ void arcnet_timeout(struct net_device *dev)
netif_wake_queue(dev); netif_wake_queue(dev);
} }
/* /*
* The typical workload of the driver: Handle the network interface * The typical workload of the driver: Handle the network interface
* interrupts. Establish which device needs attention, and call the correct * interrupts. Establish which device needs attention, and call the correct
...@@ -787,7 +774,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ...@@ -787,7 +774,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
didsomething++; didsomething++;
} }
/* a transmit finished, and we're interested in it. */ /* a transmit finished, and we're interested in it. */
if ((status & lp->intmask & TXFREEflag) || lp->timed_out) { if ((status & lp->intmask & TXFREEflag) || lp->timed_out) {
lp->intmask &= ~(TXFREEflag | EXCNAKflag); lp->intmask &= ~(TXFREEflag | EXCNAKflag);
...@@ -814,6 +800,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ...@@ -814,6 +800,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
if (lp->outgoing.proto && if (lp->outgoing.proto &&
lp->outgoing.proto->ack_tx) { lp->outgoing.proto->ack_tx) {
int ackstatus; int ackstatus;
if (status & TXACKflag) if (status & TXACKflag)
ackstatus = 2; ackstatus = 2;
else if (lp->excnak_pending) else if (lp->excnak_pending)
...@@ -838,6 +825,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ...@@ -838,6 +825,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
/* continue a split packet, if any */ /* continue a split packet, if any */
if (lp->outgoing.proto && lp->outgoing.proto->continue_tx) { if (lp->outgoing.proto && lp->outgoing.proto->continue_tx) {
int txbuf = get_arcbuf(dev); int txbuf = get_arcbuf(dev);
if (txbuf != -1) { if (txbuf != -1) {
if (lp->outgoing.proto->continue_tx(dev, txbuf)) { if (lp->outgoing.proto->continue_tx(dev, txbuf)) {
/* that was the last segment */ /* that was the last segment */
...@@ -930,7 +918,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ...@@ -930,7 +918,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
ASTATUS(), boguscount); ASTATUS(), boguscount);
BUGMSG(D_DURING, "\n"); BUGMSG(D_DURING, "\n");
AINTMASK(0); AINTMASK(0);
udelay(1); udelay(1);
AINTMASK(lp->intmask); AINTMASK(lp->intmask);
...@@ -939,7 +926,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) ...@@ -939,7 +926,6 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)
return retval; return retval;
} }
/* /*
* This is a generic packet receiver that calls arcnet??_rx depending on the * This is a generic packet receiver that calls arcnet??_rx depending on the
* protocol ID found. * protocol ID found.
...@@ -1002,7 +988,6 @@ static void arcnet_rx(struct net_device *dev, int bufnum) ...@@ -1002,7 +988,6 @@ static void arcnet_rx(struct net_device *dev, int bufnum)
arc_proto_map[soft->proto]->rx(dev, bufnum, &pkt, length); arc_proto_map[soft->proto]->rx(dev, bufnum, &pkt, length);
} }
static void null_rx(struct net_device *dev, int bufnum, static void null_rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length) struct archdr *pkthdr, int length)
{ {
...@@ -1011,7 +996,6 @@ static void null_rx(struct net_device *dev, int bufnum, ...@@ -1011,7 +996,6 @@ static void null_rx(struct net_device *dev, int bufnum,
pkthdr->soft.rfc1201.proto, pkthdr->hard.source); pkthdr->soft.rfc1201.proto, pkthdr->hard.source);
} }
static int null_build_header(struct sk_buff *skb, struct net_device *dev, static int null_build_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, uint8_t daddr) unsigned short type, uint8_t daddr)
{ {
...@@ -1025,7 +1009,6 @@ static int null_build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -1025,7 +1009,6 @@ static int null_build_header(struct sk_buff *skb, struct net_device *dev,
return 0; return 0;
} }
/* the "do nothing" prepare_tx function warns that there's nothing to do. */ /* the "do nothing" prepare_tx function warns that there's nothing to do. */
static int null_prepare_tx(struct net_device *dev, struct archdr *pkt, static int null_prepare_tx(struct net_device *dev, struct archdr *pkt,
int length, int bufnum) int length, int bufnum)
......
drivers/net/arcnet/capmode.c
View file @ 01a1d5ac
...@@ -90,7 +90,6 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -90,7 +90,6 @@ static void rx(struct net_device *dev, int bufnum,
netif_rx(skb); netif_rx(skb);
} }
/* /*
* Create the ARCnet hard/soft headers for cap mode. * Create the ARCnet hard/soft headers for cap mode.
* There aren't any soft headers in cap mode - not even the protocol id. * There aren't any soft headers in cap mode - not even the protocol id.
...@@ -130,7 +129,6 @@ static int build_header(struct sk_buff *skb, ...@@ -130,7 +129,6 @@ static int build_header(struct sk_buff *skb,
return hdr_size; /* success */ return hdr_size; /* success */
} }
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
int bufnum) int bufnum)
{ {
...@@ -138,7 +136,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -138,7 +136,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
struct arc_hardware *hard = &pkt->hard; struct arc_hardware *hard = &pkt->hard;
int ofs; int ofs;
/* hard header is not included in packet length */ /* hard header is not included in packet length */
length -= ARC_HDR_SIZE; length -= ARC_HDR_SIZE;
/* And neither is the cookie field */ /* And neither is the cookie field */
......
drivers/net/arcnet/com20020-isa.c
View file @ 01a1d5ac
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#define VERSION "arcnet: COM20020 ISA support (by David Woodhouse et al.)\n" #define VERSION "arcnet: COM20020 ISA support (by David Woodhouse et al.)\n"
/* /*
* We cannot (yet) probe for an IO mapped card, although we can check that * We cannot (yet) probe for an IO mapped card, although we can check that
* it's where we were told it was, and even do autoirq. * it's where we were told it was, and even do autoirq.
......
drivers/net/arcnet/com20020-pci.c
View file @ 01a1d5ac
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <asm/io.h> #include <asm/io.h>
#define VERSION "arcnet: COM20020 PCI support\n" #define VERSION "arcnet: COM20020 PCI support\n"
/* Module parameters */ /* Module parameters */
...@@ -86,7 +85,6 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i ...@@ -86,7 +85,6 @@ static int com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
INIT_LIST_HEAD(&priv->list_dev); INIT_LIST_HEAD(&priv->list_dev);
for (i = 0; i < ci->devcount; i++) { for (i = 0; i < ci->devcount; i++) {
struct com20020_pci_channel_map *cm = &ci->chan_map_tbl[i]; struct com20020_pci_channel_map *cm = &ci->chan_map_tbl[i];
struct com20020_dev *card; struct com20020_dev *card;
......
drivers/net/arcnet/com20020.c
View file @ 01a1d5ac
...@@ -70,7 +70,6 @@ static void com20020_copy_from_card(struct net_device *dev, int bufnum, ...@@ -70,7 +70,6 @@ static void com20020_copy_from_card(struct net_device *dev, int bufnum,
TIME("insb", count, insb(_MEMDATA, buf, count)); TIME("insb", count, insb(_MEMDATA, buf, count));
} }
static void com20020_copy_to_card(struct net_device *dev, int bufnum, static void com20020_copy_to_card(struct net_device *dev, int bufnum,
int offset, void *buf, int count) int offset, void *buf, int count)
{ {
...@@ -84,7 +83,6 @@ static void com20020_copy_to_card(struct net_device *dev, int bufnum, ...@@ -84,7 +83,6 @@ static void com20020_copy_to_card(struct net_device *dev, int bufnum,
TIME("outsb", count, outsb(_MEMDATA, buf, count)); TIME("outsb", count, outsb(_MEMDATA, buf, count));
} }
/* Reset the card and check some basic stuff during the detection stage. */ /* Reset the card and check some basic stuff during the detection stage. */
int com20020_check(struct net_device *dev) int com20020_check(struct net_device *dev)
{ {
...@@ -242,7 +240,6 @@ int com20020_found(struct net_device *dev, int shared) ...@@ -242,7 +240,6 @@ int com20020_found(struct net_device *dev, int shared)
return 0; return 0;
} }
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
...@@ -295,22 +292,21 @@ static int com20020_reset(struct net_device *dev, int really_reset) ...@@ -295,22 +292,21 @@ static int com20020_reset(struct net_device *dev, int really_reset)
return 0; return 0;
} }
static void com20020_setmask(struct net_device *dev, int mask) static void com20020_setmask(struct net_device *dev, int mask)
{ {
u_int ioaddr = dev->base_addr; 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); AINTMASK(mask);
} }
static void com20020_command(struct net_device *dev, int cmd) static void com20020_command(struct net_device *dev, int cmd)
{ {
u_int ioaddr = dev->base_addr; u_int ioaddr = dev->base_addr;
ACOMMAND(cmd); ACOMMAND(cmd);
} }
static int com20020_status(struct net_device *dev) static int com20020_status(struct net_device *dev)
{ {
u_int ioaddr = dev->base_addr; u_int ioaddr = dev->base_addr;
......
drivers/net/arcnet/com20020_cs.c
View file @ 01a1d5ac
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#define VERSION "arcnet: COM20020 PCMCIA support loaded.\n" #define VERSION "arcnet: COM20020 PCMCIA support loaded.\n"
static void regdump(struct net_device *dev) static void regdump(struct net_device *dev)
{ {
#ifdef DEBUG #ifdef DEBUG
...@@ -83,8 +82,6 @@ static void regdump(struct net_device *dev) ...@@ -83,8 +82,6 @@ static void regdump(struct net_device *dev)
#endif #endif
} }
/*====================================================================*/ /*====================================================================*/
/* Parameters that can be set with 'insmod' */ /* Parameters that can be set with 'insmod' */
...@@ -304,6 +301,7 @@ static int com20020_resume(struct pcmcia_device *link) ...@@ -304,6 +301,7 @@ static int com20020_resume(struct pcmcia_device *link)
if (link->open) { if (link->open) {
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
ARCRESET; ARCRESET;
} }
......
drivers/net/arcnet/com90io.c
View file @ 01a1d5ac
...@@ -37,10 +37,8 @@ ...@@ -37,10 +37,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/arcdevice.h> #include <linux/arcdevice.h>
#define VERSION "arcnet: COM90xx IO-mapped mode support (by David Woodhouse et el.)\n" #define VERSION "arcnet: COM90xx IO-mapped mode support (by David Woodhouse et el.)\n"
/* Internal function declarations */ /* Internal function declarations */
static int com90io_found(struct net_device *dev); static int com90io_found(struct net_device *dev);
...@@ -53,7 +51,6 @@ static void com90io_copy_to_card(struct net_device *dev, int bufnum, int offset, ...@@ -53,7 +51,6 @@ static void com90io_copy_to_card(struct net_device *dev, int bufnum, int offset,
static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offset, static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offset,
void *buf, int count); void *buf, int count);
/* Handy defines for ARCnet specific stuff */ /* Handy defines for ARCnet specific stuff */
/* The number of low I/O ports used by the card. */ /* The number of low I/O ports used by the card. */
...@@ -78,7 +75,6 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offse ...@@ -78,7 +75,6 @@ static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offse
#define AINTMASK(msk) outb((msk), _INTMASK) #define AINTMASK(msk) outb((msk), _INTMASK)
#define SETCONF() outb((lp->config), _CONFIG) #define SETCONF() outb((lp->config), _CONFIG)
/**************************************************************************** /****************************************************************************
* * * *
* IO-mapped operation routines * * IO-mapped operation routines *
...@@ -111,7 +107,6 @@ static void put_buffer_byte(struct net_device *dev, unsigned offset, u_char datu ...@@ -111,7 +107,6 @@ static void put_buffer_byte(struct net_device *dev, unsigned offset, u_char datu
#endif #endif
static void get_whole_buffer(struct net_device *dev, unsigned offset, unsigned length, char *dest) static void get_whole_buffer(struct net_device *dev, unsigned offset, unsigned length, char *dest)
{ {
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;
...@@ -227,7 +222,6 @@ static int __init com90io_probe(struct net_device *dev) ...@@ -227,7 +222,6 @@ static int __init com90io_probe(struct net_device *dev)
return -ENODEV; return -ENODEV;
} }
/* Set up the struct net_device associated with this card. Called after /* Set up the struct net_device associated with this card. Called after
* probing succeeds. * probing succeeds.
*/ */
...@@ -279,7 +273,6 @@ static int __init com90io_found(struct net_device *dev) ...@@ -279,7 +273,6 @@ static int __init com90io_found(struct net_device *dev)
return 0; return 0;
} }
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
...@@ -319,7 +312,6 @@ static int com90io_reset(struct net_device *dev, int really_reset) ...@@ -319,7 +312,6 @@ static int com90io_reset(struct net_device *dev, int really_reset)
return 0; return 0;
} }
static void com90io_command(struct net_device *dev, int cmd) static void com90io_command(struct net_device *dev, int cmd)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -327,7 +319,6 @@ static void com90io_command(struct net_device *dev, int cmd) ...@@ -327,7 +319,6 @@ static void com90io_command(struct net_device *dev, int cmd)
ACOMMAND(cmd); ACOMMAND(cmd);
} }
static int com90io_status(struct net_device *dev) static int com90io_status(struct net_device *dev)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -335,7 +326,6 @@ static int com90io_status(struct net_device *dev) ...@@ -335,7 +326,6 @@ static int com90io_status(struct net_device *dev)
return ASTATUS(); return ASTATUS();
} }
static void com90io_setmask(struct net_device *dev, int mask) static void com90io_setmask(struct net_device *dev, int mask)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -349,7 +339,6 @@ static void com90io_copy_to_card(struct net_device *dev, int bufnum, int offset, ...@@ -349,7 +339,6 @@ static void com90io_copy_to_card(struct net_device *dev, int bufnum, int offset,
TIME("put_whole_buffer", count, put_whole_buffer(dev, bufnum * 512 + offset, count, buf)); TIME("put_whole_buffer", count, put_whole_buffer(dev, bufnum * 512 + offset, count, buf));
} }
static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offset, static void com90io_copy_from_card(struct net_device *dev, int bufnum, int offset,
void *buf, int count) void *buf, int count)
{ {
...@@ -369,6 +358,7 @@ MODULE_LICENSE("GPL"); ...@@ -369,6 +358,7 @@ MODULE_LICENSE("GPL");
static int __init com90io_setup(char *s) static int __init com90io_setup(char *s)
{ {
int ints[4]; int ints[4];
s = get_options(s, 4, ints); s = get_options(s, 4, ints);
if (!ints[0]) if (!ints[0])
return 0; return 0;
......
drivers/net/arcnet/com90xx.c
View file @ 01a1d5ac
...@@ -35,10 +35,8 @@ ...@@ -35,10 +35,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/arcdevice.h> #include <linux/arcdevice.h>
#define VERSION "arcnet: COM90xx chipset support\n" #define VERSION "arcnet: COM90xx chipset support\n"
/* Define this to speed up the autoprobe by assuming if only one io port and /* Define this to speed up the autoprobe by assuming if only one io port and
* shmem are left in the list at Stage 5, they must correspond to each * shmem are left in the list at Stage 5, they must correspond to each
* other. * other.
...@@ -53,7 +51,6 @@ ...@@ -53,7 +51,6 @@
*/ */
#undef FAST_PROBE #undef FAST_PROBE
/* Internal function declarations */ /* Internal function declarations */
static int com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *); static int com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem *);
static void com90xx_command(struct net_device *dev, int command); static void com90xx_command(struct net_device *dev, int command);
...@@ -97,7 +94,6 @@ static int numcards; ...@@ -97,7 +94,6 @@ static int numcards;
#define ACOMMAND(cmd) outb((cmd), _COMMAND) #define ACOMMAND(cmd) outb((cmd), _COMMAND)
#define AINTMASK(msk) outb((msk), _INTMASK) #define AINTMASK(msk) outb((msk), _INTMASK)
static int com90xx_skip_probe __initdata = 0; static int com90xx_skip_probe __initdata = 0;
/* Module parameters */ /* Module parameters */
...@@ -308,6 +304,7 @@ static void __init com90xx_probe(void) ...@@ -308,6 +304,7 @@ static void __init com90xx_probe(void)
numprint = -1; numprint = -1;
for (port = &ports[0]; port < ports + numports; port++) { for (port = &ports[0]; port < ports + numports; port++) {
int found = 0; int found = 0;
numprint++; numprint++;
numprint %= 8; numprint %= 8;
if (!numprint) { if (!numprint) {
...@@ -552,7 +549,6 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem ...@@ -552,7 +549,6 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem, void __iomem
return -EIO; return -EIO;
} }
static void com90xx_command(struct net_device *dev, int cmd) static void com90xx_command(struct net_device *dev, int cmd)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -560,7 +556,6 @@ static void com90xx_command(struct net_device *dev, int cmd) ...@@ -560,7 +556,6 @@ static void com90xx_command(struct net_device *dev, int cmd)
ACOMMAND(cmd); ACOMMAND(cmd);
} }
static int com90xx_status(struct net_device *dev) static int com90xx_status(struct net_device *dev)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -568,7 +563,6 @@ static int com90xx_status(struct net_device *dev) ...@@ -568,7 +563,6 @@ static int com90xx_status(struct net_device *dev)
return ASTATUS(); return ASTATUS();
} }
static void com90xx_setmask(struct net_device *dev, int mask) static void com90xx_setmask(struct net_device *dev, int mask)
{ {
short ioaddr = dev->base_addr; short ioaddr = dev->base_addr;
...@@ -576,7 +570,6 @@ static void com90xx_setmask(struct net_device *dev, int mask) ...@@ -576,7 +570,6 @@ static void com90xx_setmask(struct net_device *dev, int mask)
AINTMASK(mask); AINTMASK(mask);
} }
/* /*
* Do a hardware reset on the card, and set up necessary registers. * Do a hardware reset on the card, and set up necessary registers.
* *
...@@ -625,19 +618,19 @@ static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset, ...@@ -625,19 +618,19 @@ static void com90xx_copy_to_card(struct net_device *dev, int bufnum, int offset,
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset;
TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count)); TIME("memcpy_toio", count, memcpy_toio(memaddr, buf, count));
} }
static void com90xx_copy_from_card(struct net_device *dev, int bufnum, int offset, static void com90xx_copy_from_card(struct net_device *dev, int bufnum, int offset,
void *buf, int count) void *buf, int count)
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset; void __iomem *memaddr = lp->mem_start + bufnum * 512 + offset;
TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count)); TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
} }
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __init com90xx_init(void) static int __init com90xx_init(void)
......
drivers/net/arcnet/rfc1051.c
View file @ 01a1d5ac
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n" #define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n"
static __be16 type_trans(struct sk_buff *skb, struct net_device *dev); static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length); struct archdr *pkthdr, int length);
...@@ -43,7 +42,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -43,7 +42,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
int bufnum); int bufnum);
static struct ArcProto rfc1051_proto = static struct ArcProto rfc1051_proto =
{ {
.suffix = 's', .suffix = 's',
...@@ -56,7 +54,6 @@ static struct ArcProto rfc1051_proto = ...@@ -56,7 +54,6 @@ static struct ArcProto rfc1051_proto =
.ack_tx = NULL .ack_tx = NULL
}; };
static int __init arcnet_rfc1051_init(void) static int __init arcnet_rfc1051_init(void)
{ {
printk(VERSION); printk(VERSION);
...@@ -120,7 +117,6 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -120,7 +117,6 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
return htons(ETH_P_IP); return htons(ETH_P_IP);
} }
/* packet receiver */ /* packet receiver */
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length) struct archdr *pkthdr, int length)
...@@ -161,7 +157,6 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -161,7 +157,6 @@ static void rx(struct net_device *dev, int bufnum,
netif_rx(skb); netif_rx(skb);
} }
/* /*
* Create the ARCnet hard/soft headers for RFC1051. * Create the ARCnet hard/soft headers for RFC1051.
*/ */
...@@ -188,7 +183,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -188,7 +183,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
return 0; return 0;
} }
/* /*
* Set the source hardware address. * Set the source hardware address.
* *
...@@ -214,7 +208,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -214,7 +208,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
return hdr_size; /* success */ return hdr_size; /* success */
} }
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
int bufnum) int bufnum)
{ {
......
drivers/net/arcnet/rfc1201.c
View file @ 01a1d5ac
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n" #define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n"
static __be16 type_trans(struct sk_buff *skb, struct net_device *dev); static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length); struct archdr *pkthdr, int length);
...@@ -56,7 +55,6 @@ static struct ArcProto rfc1201_proto = ...@@ -56,7 +55,6 @@ static struct ArcProto rfc1201_proto =
.ack_tx = NULL .ack_tx = NULL
}; };
static int __init arcnet_rfc1201_init(void) static int __init arcnet_rfc1201_init(void)
{ {
printk(VERSION); printk(VERSION);
...@@ -129,7 +127,6 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev) ...@@ -129,7 +127,6 @@ static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
return htons(ETH_P_IP); return htons(ETH_P_IP);
} }
/* packet receiver */ /* packet receiver */
static void rx(struct net_device *dev, int bufnum, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length) struct archdr *pkthdr, int length)
...@@ -369,7 +366,6 @@ static void rx(struct net_device *dev, int bufnum, ...@@ -369,7 +366,6 @@ static void rx(struct net_device *dev, int bufnum,
} }
} }
/* Create the ARCnet hard/soft headers for RFC1201. */ /* Create the ARCnet hard/soft headers for RFC1201. */
static int build_header(struct sk_buff *skb, struct net_device *dev, static int build_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, uint8_t daddr) unsigned short type, uint8_t daddr)
...@@ -437,7 +433,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev, ...@@ -437,7 +433,6 @@ static int build_header(struct sk_buff *skb, struct net_device *dev,
return hdr_size; return hdr_size;
} }
static void load_pkt(struct net_device *dev, struct arc_hardware *hard, static void load_pkt(struct net_device *dev, struct arc_hardware *hard,
struct arc_rfc1201 *soft, int softlen, int bufnum) struct arc_rfc1201 *soft, int softlen, int bufnum)
{ {
...@@ -470,7 +465,6 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard, ...@@ -470,7 +465,6 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard,
lp->lastload_dest = hard->dest; lp->lastload_dest = hard->dest;
} }
static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
int bufnum) int bufnum)
{ {
...@@ -478,7 +472,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -478,7 +472,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
const int maxsegsize = XMTU - RFC1201_HDR_SIZE; const int maxsegsize = XMTU - RFC1201_HDR_SIZE;
struct Outgoing *out; struct Outgoing *out;
BUGMSG(D_DURING, "prepare_tx: txbufs=%d/%d/%d\n", BUGMSG(D_DURING, "prepare_tx: txbufs=%d/%d/%d\n",
lp->next_tx, lp->cur_tx, bufnum); lp->next_tx, lp->cur_tx, bufnum);
...@@ -506,7 +499,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length, ...@@ -506,7 +499,6 @@ static int prepare_tx(struct net_device *dev, struct archdr *pkt, int length,
return 1; /* done */ return 1; /* done */
} }
static int continue_tx(struct net_device *dev, int bufnum) static int continue_tx(struct net_device *dev, int bufnum)
{ {
struct arcnet_local *lp = netdev_priv(dev); struct arcnet_local *lp = netdev_priv(dev);
......
include/linux/arcdevice.h
View file @ 01a1d5ac
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
*/ */
#define RECON_THRESHOLD 30 #define RECON_THRESHOLD 30
/* /*
* Define this to the minimum "timeout" value. If a transmit takes longer * Define this to the minimum "timeout" value. If a transmit takes longer
* than TX_TIMEOUT jiffies, Linux will abort the TX and retry. On a large * than TX_TIMEOUT jiffies, Linux will abort the TX and retry. On a large
...@@ -44,11 +43,9 @@ ...@@ -44,11 +43,9 @@
*/ */
#define TX_TIMEOUT (HZ * 200 / 1000) #define TX_TIMEOUT (HZ * 200 / 1000)
/* Display warnings about the driver being an ALPHA version. */ /* Display warnings about the driver being an ALPHA version. */
#undef ALPHA_WARNING #undef ALPHA_WARNING
/* /*
* Debugging bitflags: each option can be enabled individually. * Debugging bitflags: each option can be enabled individually.
* *
...@@ -106,7 +103,6 @@ extern int arcnet_debug; ...@@ -106,7 +103,6 @@ extern int arcnet_debug;
call; \ call; \
} }
/* /*
* Time needed to reset the card - in ms (milliseconds). This works on my * Time needed to reset the card - in ms (milliseconds). This works on my
* SMC PC100. I can't find a reference that tells me just how long I * SMC PC100. I can't find a reference that tells me just how long I
...@@ -182,7 +178,6 @@ extern int arcnet_debug; ...@@ -182,7 +178,6 @@ extern int arcnet_debug;
#define ARC_CAN_10MBIT 2 /* card uses COM20022, supporting 10MBit, #define ARC_CAN_10MBIT 2 /* card uses COM20022, supporting 10MBit,
but default is 2.5MBit. */ but default is 2.5MBit. */
/* information needed to define an encapsulation driver */ /* information needed to define an encapsulation driver */
struct ArcProto { struct ArcProto {
char suffix; /* a for RFC1201, e for ether-encap, etc. */ char suffix; /* a for RFC1201, e for ether-encap, etc. */
...@@ -204,7 +199,6 @@ struct ArcProto { ...@@ -204,7 +199,6 @@ struct ArcProto {
extern struct ArcProto *arc_proto_map[256], *arc_proto_default, extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
*arc_bcast_proto, *arc_raw_proto; *arc_bcast_proto, *arc_raw_proto;
/* /*
* "Incoming" is information needed for each address that could be sending * "Incoming" is information needed for each address that could be sending
* to us. Mostly for partially-received split packets. * to us. Mostly for partially-received split packets.
...@@ -216,7 +210,6 @@ struct Incoming { ...@@ -216,7 +210,6 @@ struct Incoming {
numpackets; /* number of packets in split */ numpackets; /* number of packets in split */
}; };
/* only needed for RFC1201 */ /* only needed for RFC1201 */
struct Outgoing { struct Outgoing {
struct ArcProto *proto; /* protocol driver that owns this: struct ArcProto *proto; /* protocol driver that owns this:
...@@ -230,7 +223,6 @@ struct Outgoing { ...@@ -230,7 +223,6 @@ struct Outgoing {
numsegs; /* number of segments */ numsegs; /* number of segments */
}; };
struct arcnet_local { struct arcnet_local {
uint8_t config, /* current value of CONFIG register */ uint8_t config, /* current value of CONFIG register */
timeout, /* Extended timeout for COM20020 */ timeout, /* Extended timeout for COM20020 */
...@@ -251,7 +243,6 @@ struct arcnet_local { ...@@ -251,7 +243,6 @@ struct arcnet_local {
char *card_name; /* card ident string */ char *card_name; /* card ident string */
int card_flags; /* special card features */ int card_flags; /* special card features */
/* On preemtive and SMB a lock is needed */ /* On preemtive and SMB a lock is needed */
spinlock_t lock; spinlock_t lock;
...@@ -314,14 +305,11 @@ struct arcnet_local { ...@@ -314,14 +305,11 @@ struct arcnet_local {
void __iomem *mem_start; /* pointer to ioremap'ed MMIO */ void __iomem *mem_start; /* pointer to ioremap'ed MMIO */
}; };
#define ARCRESET(x) (lp->hw.reset(dev, (x))) #define ARCRESET(x) (lp->hw.reset(dev, (x)))
#define ACOMMAND(x) (lp->hw.command(dev, (x))) #define ACOMMAND(x) (lp->hw.command(dev, (x)))
#define ASTATUS() (lp->hw.status(dev)) #define ASTATUS() (lp->hw.status(dev))
#define AINTMASK(x) (lp->hw.intmask(dev, (x))) #define AINTMASK(x) (lp->hw.intmask(dev, (x)))
#if ARCNET_DEBUG_MAX & D_SKB #if ARCNET_DEBUG_MAX & D_SKB
void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc); void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc);
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7