git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
smc9194.c
diff --git
a/drivers/net/smc9194.c
b/drivers/net/smc9194.c
index
f5071b0
..
bd6e845
100644
(file)
--- a/
drivers/net/smc9194.c
+++ b/
drivers/net/smc9194.c
@@
-72,8
+72,8
@@
static const char version[] =
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
+#include <linux/bitops.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include "smc9194.h"
#include <asm/io.h>
#include "smc9194.h"
@@
-270,7
+270,7
@@
static void smc_set_multicast_list(struct net_device *dev);
/*
. Handles the actual interrupt
*/
/*
. Handles the actual interrupt
*/
-static irqreturn_t smc_interrupt(int irq, void *
, struct pt_regs *regs
);
+static irqreturn_t smc_interrupt(int irq, void *);
/*
. This is a separate procedure to handle the receipt of a packet, to
. leave the interrupt code looking slightly cleaner
/*
. This is a separate procedure to handle the receipt of a packet, to
. leave the interrupt code looking slightly cleaner
@@
-523,14
+523,13
@@
static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de
length = skb->len;
if (length < ETH_ZLEN) {
length = skb->len;
if (length < ETH_ZLEN) {
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL) {
+ if (skb_padto(skb, ETH_ZLEN)) {
netif_wake_queue(dev);
return 0;
}
length = ETH_ZLEN;
}
netif_wake_queue(dev);
return 0;
}
length = ETH_ZLEN;
}
-
+
/*
** The MMU wants the number of pages to be the number of 256 bytes
** 'pages', minus 1 ( since a packet can't ever have 0 pages :) )
/*
** The MMU wants the number of pages to be the number of 256 bytes
** 'pages', minus 1 ( since a packet can't ever have 0 pages :) )
@@
-732,12
+731,9
@@
static int ifport;
struct net_device * __init smc_init(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));
struct net_device * __init smc_init(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));
- st
atic st
ruct devlist *smcdev = smc_devlist;
+ struct devlist *smcdev = smc_devlist;
int err = 0;
int err = 0;
-#ifndef NO_AUTOPROBE
- smcdev = smc_devlist;
-#endif
if (!dev)
return ERR_PTR(-ENODEV);
if (!dev)
return ERR_PTR(-ENODEV);
@@
-1163,7
+1159,7
@@
static int smc_open(struct net_device *dev)
address |= dev->dev_addr[ i ];
outw( address, ioaddr + ADDR0 + i );
}
address |= dev->dev_addr[ i ];
outw( address, ioaddr + ADDR0 + i );
}
-
+
netif_start_queue(dev);
return 0;
}
netif_start_queue(dev);
return 0;
}
@@
-1395,7
+1391,7
@@
static void smc_tx( struct net_device * dev )
.
---------------------------------------------------------------------*/
.
---------------------------------------------------------------------*/
-static irqreturn_t smc_interrupt(int irq, void * dev_id
, struct pt_regs * regs
)
+static irqreturn_t smc_interrupt(int irq, void * dev_id)
{
struct net_device *dev = dev_id;
int ioaddr = dev->base_addr;
{
struct net_device *dev = dev_id;
int ioaddr = dev->base_addr;
@@
-1600,14
+1596,14
@@
static void smc_set_multicast_list(struct net_device *dev)
static struct net_device *devSMC9194;
MODULE_LICENSE("GPL");
static struct net_device *devSMC9194;
MODULE_LICENSE("GPL");
-
MODULE_PARM(io, "i"
);
-
MODULE_PARM(irq, "i"
);
-
MODULE_PARM(ifport, "i"
);
+
module_param(io, int, 0
);
+
module_param(irq, int, 0
);
+
module_param(ifport, int, 0
);
MODULE_PARM_DESC(io, "SMC 99194 I/O base address");
MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");
MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)");
MODULE_PARM_DESC(io, "SMC 99194 I/O base address");
MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");
MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)");
-int init_module(void)
+int
__init
init_module(void)
{
if (io == 0)
printk(KERN_WARNING
{
if (io == 0)
printk(KERN_WARNING
@@
-1620,7
+1616,7
@@
int init_module(void)
return 0;
}
return 0;
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
unregister_netdev(devSMC9194);
free_irq(devSMC9194->irq, devSMC9194);
{
unregister_netdev(devSMC9194);
free_irq(devSMC9194->irq, devSMC9194);