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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
pcmcia
/
3c589_cs.c
diff --git
a/drivers/net/pcmcia/3c589_cs.c
b/drivers/net/pcmcia/3c589_cs.c
index
2e0135d
..
89abdda
100644
(file)
--- a/
drivers/net/pcmcia/3c589_cs.c
+++ b/
drivers/net/pcmcia/3c589_cs.c
@@
-38,6
+38,7
@@
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/ioport.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/ioport.h>
+#include <linux/bitops.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
@@
-50,7
+51,6
@@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/system.h>
-#include <asm/bitops.h>
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
/* To minimize the size of the driver source I only define operating
constants if they are used several times. You'll need the manual
@@
-126,16
+126,11
@@
MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
MODULE_DESCRIPTION("3Com 3c589 series PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("3Com 3c589 series PCMCIA ethernet driver");
MODULE_LICENSE("GPL");
-#define INT_MODULE_PARM(n, v) static int n = v;
MODULE_PARM(n, "i"
)
+#define INT_MODULE_PARM(n, v) static int n = v;
module_param(n, int, 0
)
/* Special hook for setting if_port when module is loaded */
INT_MODULE_PARM(if_port, 0);
/* Special hook for setting if_port when module is loaded */
INT_MODULE_PARM(if_port, 0);
-/* Bit map of interrupts to choose from */
-INT_MODULE_PARM(irq_mask, 0xdeb8);
-static int irq_list[4] = { -1 };
-MODULE_PARM(irq_list, "1-4i");
-
#ifdef PCMCIA_DEBUG
INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
#ifdef PCMCIA_DEBUG
INT_MODULE_PARM(pc_debug, PCMCIA_DEBUG);
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
@@
-152,7
+147,7
@@
static void tc589_release(dev_link_t *link);
static int tc589_event(event_t event, int priority,
event_callback_args_t *args);
static int tc589_event(event_t event, int priority,
event_callback_args_t *args);
-static u16 read_eeprom(
io
addr_t ioaddr, int index);
+static u16 read_eeprom(
kio_
addr_t ioaddr, int index);
static void tc589_reset(struct net_device *dev);
static void media_check(unsigned long arg);
static int el3_config(struct net_device *dev, struct ifmap *map);
static void tc589_reset(struct net_device *dev);
static void media_check(unsigned long arg);
static int el3_config(struct net_device *dev, struct ifmap *map);
@@
-188,7
+183,7
@@
static dev_link_t *tc589_attach(void)
client_reg_t client_reg;
dev_link_t *link;
struct net_device *dev;
client_reg_t client_reg;
dev_link_t *link;
struct net_device *dev;
- int
i,
ret;
+ int ret;
DEBUG(0, "3c589_attach()\n");
DEBUG(0, "3c589_attach()\n");
@@
-204,12
+199,7
@@
static dev_link_t *tc589_attach(void)
link->io.NumPorts1 = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
link->io.NumPorts1 = 16;
link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
- link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
- if (irq_list[0] == -1)
- link->irq.IRQInfo2 = irq_mask;
- else
- for (i = 0; i < 4; i++)
- link->irq.IRQInfo2 |= 1 << irq_list[i];
+ link->irq.IRQInfo1 = IRQ_LEVEL_ID;
link->irq.Handler = &el3_interrupt;
link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->irq.Handler = &el3_interrupt;
link->irq.Instance = dev;
link->conf.Attributes = CONF_ENABLE_IRQ;
@@
-236,7
+226,6
@@
static dev_link_t *tc589_attach(void)
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
link->next = dev_list;
dev_list = link;
client_reg.dev_info = &dev_info;
- client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
client_reg.EventMask =
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
@@
-310,7
+299,7
@@
static void tc589_config(dev_link_t *link)
cisparse_t parse;
u16 buf[32], *phys_addr;
int last_fn, last_ret, i, j, multi = 0, fifo;
cisparse_t parse;
u16 buf[32], *phys_addr;
int last_fn, last_ret, i, j, multi = 0, fifo;
-
io
addr_t ioaddr;
+
kio_
addr_t ioaddr;
char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
DEBUG(0, "3c589_config(0x%p)\n", link);
char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
DEBUG(0, "3c589_config(0x%p)\n", link);
@@
-391,6
+380,7
@@
static void tc589_config(dev_link_t *link)
link->dev = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
link->dev = &lp->node;
link->state &= ~DEV_CONFIG_PENDING;
+ SET_NETDEV_DEV(dev, &handle_to_dev(handle));
if (register_netdev(dev) != 0) {
printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
if (register_netdev(dev) != 0) {
printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
@@
-510,7
+500,7
@@
static void tc589_wait_for_completion(struct net_device *dev, int cmd)
Read a word from the EEPROM using the regular EEPROM access register.
Assume that we are in register window zero.
*/
Read a word from the EEPROM using the regular EEPROM access register.
Assume that we are in register window zero.
*/
-static u16 read_eeprom(
io
addr_t ioaddr, int index)
+static u16 read_eeprom(
kio_
addr_t ioaddr, int index)
{
int i;
outw(EEPROM_READ + index, ioaddr + 10);
{
int i;
outw(EEPROM_READ + index, ioaddr + 10);
@@
-528,7
+518,7
@@
static u16 read_eeprom(ioaddr_t ioaddr, int index)
static void tc589_set_xcvr(struct net_device *dev, int if_port)
{
struct el3_private *lp = netdev_priv(dev);
static void tc589_set_xcvr(struct net_device *dev, int if_port)
{
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
EL3WINDOW(0);
switch (if_port) {
EL3WINDOW(0);
switch (if_port) {
@@
-550,7
+540,7
@@
static void tc589_set_xcvr(struct net_device *dev, int if_port)
static void dump_status(struct net_device *dev)
{
static void dump_status(struct net_device *dev)
{
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
EL3WINDOW(1);
printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
"%02x tx free %04x\n", inw(ioaddr+EL3_STATUS),
EL3WINDOW(1);
printk(KERN_INFO " irq status %04x, rx status %04x, tx status "
"%02x tx free %04x\n", inw(ioaddr+EL3_STATUS),
@@
-566,7
+556,7
@@
static void dump_status(struct net_device *dev)
/* Reset and restore all of the 3c589 registers. */
static void tc589_reset(struct net_device *dev)
{
/* Reset and restore all of the 3c589 registers. */
static void tc589_reset(struct net_device *dev)
{
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
int i;
EL3WINDOW(0);
int i;
EL3WINDOW(0);
@@
-674,7
+664,7
@@
static int el3_open(struct net_device *dev)
static void el3_tx_timeout(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
static void el3_tx_timeout(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name);
dump_status(dev);
printk(KERN_WARNING "%s: Transmit timed out!\n", dev->name);
dump_status(dev);
@@
-689,7
+679,7
@@
static void el3_tx_timeout(struct net_device *dev)
static void pop_tx_status(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
static void pop_tx_status(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
int i;
/* Clear the Tx status stack. */
int i;
/* Clear the Tx status stack. */
@@
-711,7
+701,7
@@
static void pop_tx_status(struct net_device *dev)
static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
struct el3_private *priv = netdev_priv(dev);
DEBUG(3, "%s: el3_start_xmit(length = %ld) called, "
struct el3_private *priv = netdev_priv(dev);
DEBUG(3, "%s: el3_start_xmit(length = %ld) called, "
@@
-744,7
+734,8
@@
static irqreturn_t el3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct el3_private *lp = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *) dev_id;
struct el3_private *lp = netdev_priv(dev);
- ioaddr_t ioaddr, status;
+ kio_addr_t ioaddr;
+ __u16 status;
int i = 0, handled = 1;
if (!netif_device_present(dev))
int i = 0, handled = 1;
if (!netif_device_present(dev))
@@
-829,7
+820,7
@@
static void media_check(unsigned long arg)
{
struct net_device *dev = (struct net_device *)(arg);
struct el3_private *lp = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *)(arg);
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
u16 media, errs;
unsigned long flags;
u16 media, errs;
unsigned long flags;
@@
-931,7
+922,7
@@
static struct net_device_stats *el3_get_stats(struct net_device *dev)
static void update_stats(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
static void update_stats(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
DEBUG(2, "%s: updating the statistics.\n", dev->name);
/* Turn off statistics updates while reading. */
DEBUG(2, "%s: updating the statistics.\n", dev->name);
/* Turn off statistics updates while reading. */
@@
-958,7
+949,7
@@
static void update_stats(struct net_device *dev)
static int el3_rx(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
static int el3_rx(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
int worklimit = 32;
short rx_status;
int worklimit = 32;
short rx_status;
@@
-1013,7
+1004,7
@@
static void set_multicast_list(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
{
struct el3_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
u16 opts = SetRxFilter | RxStation | RxBroadcast;
if (!(DEV_OK(link))) return;
u16 opts = SetRxFilter | RxStation | RxBroadcast;
if (!(DEV_OK(link))) return;
@@
-1028,7
+1019,7
@@
static int el3_close(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
{
struct el3_private *lp = netdev_priv(dev);
dev_link_t *link = &lp->link;
-
io
addr_t ioaddr = dev->base_addr;
+
kio_
addr_t ioaddr = dev->base_addr;
DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
@@
-1083,8
+1074,7
@@
static int __init init_tc589(void)
static void __exit exit_tc589(void)
{
pcmcia_unregister_driver(&tc589_driver);
static void __exit exit_tc589(void)
{
pcmcia_unregister_driver(&tc589_driver);
- while (dev_list != NULL)
- tc589_detach(dev_list);
+ BUG_ON(dev_list != NULL);
}
module_init(init_tc589);
}
module_init(init_tc589);