Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 6064
b: refs/heads/master
c: 504ff16
h: refs/heads/master
v: v3
  • Loading branch information
Jochen Friedrich authored and Jeff Garzik committed Jul 31, 2005
1 parent d50939f commit 628e7a9
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 144 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b38aefe924daf2e4fdd73b384f21c913f31b668
refs/heads/master: 504ff16cecf2a788181eddc9d6e47d94ce50a9f6
6 changes: 0 additions & 6 deletions trunk/drivers/net/Space.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,6 @@ extern struct net_device *proteon_probe(int unit);
extern struct net_device *smctr_probe(int unit);

static struct devprobe2 tr_probes2[] __initdata = {
#ifdef CONFIG_SKISA
{sk_isa_probe, 0},
#endif
#ifdef CONFIG_PROTEON
{proteon_probe, 0},
#endif
#ifdef CONFIG_SMCTR
{smctr_probe, 0},
#endif
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/tokenring/abyss.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
*/
dev->base_addr += 0x10;

ret = tmsdev_init(dev, PCI_MAX_ADDRESS, pdev);
ret = tmsdev_init(dev, PCI_MAX_ADDRESS, &pdev->dev);
if (ret) {
printk("%s: unable to get memory for dev->priv.\n",
dev->name);
Expand Down
104 changes: 49 additions & 55 deletions trunk/drivers/net/tokenring/proteon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ static int dmalist[] __initdata = {
};

static char cardname[] = "Proteon 1392\0";

struct net_device *proteon_probe(int unit);
static u64 dma_mask = ISA_MAX_ADDRESS;
static int proteon_open(struct net_device *dev);
static void proteon_read_eeprom(struct net_device *dev);
static unsigned short proteon_setnselout_pins(struct net_device *dev);
Expand Down Expand Up @@ -116,7 +115,7 @@ static int __init proteon_probe1(struct net_device *dev, int ioaddr)
return -ENODEV;
}

static int __init setup_card(struct net_device *dev)
static int __init setup_card(struct net_device *dev, struct device *pdev)
{
struct net_local *tp;
static int versionprinted;
Expand All @@ -137,22 +136,23 @@ static int __init setup_card(struct net_device *dev)
}
}
if (err)
goto out4;
goto out5;

/* At this point we have found a valid card. */

if (versionprinted++ == 0)
printk(KERN_DEBUG "%s", version);

err = -EIO;
if (tmsdev_init(dev, ISA_MAX_ADDRESS, NULL))
pdev->dma_mask = &dma_mask;
if (tmsdev_init(dev, ISA_MAX_ADDRESS, pdev))
goto out4;

dev->base_addr &= ~3;

proteon_read_eeprom(dev);

printk(KERN_DEBUG "%s: Ring Station Address: ", dev->name);
printk(KERN_DEBUG "proteon.c: Ring Station Address: ");
printk("%2.2x", dev->dev_addr[0]);
for (j = 1; j < 6; j++)
printk(":%2.2x", dev->dev_addr[j]);
Expand Down Expand Up @@ -185,7 +185,7 @@ static int __init setup_card(struct net_device *dev)

if(irqlist[j] == 0)
{
printk(KERN_INFO "%s: AutoSelect no IRQ available\n", dev->name);
printk(KERN_INFO "proteon.c: AutoSelect no IRQ available\n");
goto out3;
}
}
Expand All @@ -196,15 +196,15 @@ static int __init setup_card(struct net_device *dev)
break;
if (irqlist[j] == 0)
{
printk(KERN_INFO "%s: Illegal IRQ %d specified\n",
dev->name, dev->irq);
printk(KERN_INFO "proteon.c: Illegal IRQ %d specified\n",
dev->irq);
goto out3;
}
if (request_irq(dev->irq, tms380tr_interrupt, 0,
cardname, dev))
{
printk(KERN_INFO "%s: Selected IRQ %d not available\n",
dev->name, dev->irq);
printk(KERN_INFO "proteon.c: Selected IRQ %d not available\n",
dev->irq);
goto out3;
}
}
Expand All @@ -220,7 +220,7 @@ static int __init setup_card(struct net_device *dev)

if(dmalist[j] == 0)
{
printk(KERN_INFO "%s: AutoSelect no DMA available\n", dev->name);
printk(KERN_INFO "proteon.c: AutoSelect no DMA available\n");
goto out2;
}
}
Expand All @@ -231,25 +231,25 @@ static int __init setup_card(struct net_device *dev)
break;
if (dmalist[j] == 0)
{
printk(KERN_INFO "%s: Illegal DMA %d specified\n",
dev->name, dev->dma);
printk(KERN_INFO "proteon.c: Illegal DMA %d specified\n",
dev->dma);
goto out2;
}
if (request_dma(dev->dma, cardname))
{
printk(KERN_INFO "%s: Selected DMA %d not available\n",
dev->name, dev->dma);
printk(KERN_INFO "proteon.c: Selected DMA %d not available\n",
dev->dma);
goto out2;
}
}

printk(KERN_DEBUG "%s: IO: %#4lx IRQ: %d DMA: %d\n",
dev->name, dev->base_addr, dev->irq, dev->dma);

err = register_netdev(dev);
if (err)
goto out;

printk(KERN_DEBUG "%s: IO: %#4lx IRQ: %d DMA: %d\n",
dev->name, dev->base_addr, dev->irq, dev->dma);

return 0;
out:
free_dma(dev->dma);
Expand All @@ -258,34 +258,11 @@ static int __init setup_card(struct net_device *dev)
out3:
tmsdev_term(dev);
out4:
release_region(dev->base_addr, PROTEON_IO_EXTENT);
release_region(dev->base_addr, PROTEON_IO_EXTENT);
out5:
return err;
}

struct net_device * __init proteon_probe(int unit)
{
struct net_device *dev = alloc_trdev(sizeof(struct net_local));
int err = 0;

if (!dev)
return ERR_PTR(-ENOMEM);

if (unit >= 0) {
sprintf(dev->name, "tr%d", unit);
netdev_boot_setup_check(dev);
}

err = setup_card(dev);
if (err)
goto out;

return dev;

out:
free_netdev(dev);
return ERR_PTR(err);
}

/*
* Reads MAC address from adapter RAM, which should've read it from
* the onboard ROM.
Expand Down Expand Up @@ -352,8 +329,6 @@ static int proteon_open(struct net_device *dev)
return tms380tr_open(dev);
}

#ifdef MODULE

#define ISATR_MAX_ADAPTERS 3

static int io[ISATR_MAX_ADAPTERS];
Expand All @@ -366,13 +341,23 @@ module_param_array(io, int, NULL, 0);
module_param_array(irq, int, NULL, 0);
module_param_array(dma, int, NULL, 0);

static struct net_device *proteon_dev[ISATR_MAX_ADAPTERS];
static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];

static struct device_driver proteon_driver = {
.name = "proteon",
.bus = &platform_bus_type,
};

int init_module(void)
static int __init proteon_init(void)
{
struct net_device *dev;
struct platform_device *pdev;
int i, num = 0, err = 0;

err = driver_register(&proteon_driver);
if (err)
return err;

for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
dev = alloc_trdev(sizeof(struct net_local));
if (!dev)
Expand All @@ -381,11 +366,15 @@ int init_module(void)
dev->base_addr = io[i];
dev->irq = irq[i];
dev->dma = dma[i];
err = setup_card(dev);
pdev = platform_device_register_simple("proteon",
i, NULL, 0);
err = setup_card(dev, &pdev->dev);
if (!err) {
proteon_dev[i] = dev;
proteon_dev[i] = pdev;
dev_set_drvdata(&pdev->dev, dev);
++num;
} else {
platform_device_unregister(pdev);
free_netdev(dev);
}
}
Expand All @@ -399,23 +388,28 @@ int init_module(void)
return (0);
}

void cleanup_module(void)
static void __exit proteon_cleanup(void)
{
struct net_device *dev;
int i;

for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
struct net_device *dev = proteon_dev[i];
struct platform_device *pdev = proteon_dev[i];

if (!dev)
if (!pdev)
continue;

dev = dev_get_drvdata(&pdev->dev);
unregister_netdev(dev);
release_region(dev->base_addr, PROTEON_IO_EXTENT);
free_irq(dev->irq, dev);
free_dma(dev->dma);
tmsdev_term(dev);
free_netdev(dev);
dev_set_drvdata(&pdev->dev, NULL);
platform_device_unregister(pdev);
}
driver_unregister(&proteon_driver);
}
#endif /* MODULE */

module_init(proteon_init);
module_exit(proteon_cleanup);
Loading

0 comments on commit 628e7a9

Please sign in to comment.