Skip to content

Commit

Permalink
[netdrvr] Convert madgemc to new MCA API.
Browse files Browse the repository at this point in the history
Now that all tms380 devices have a valid
struct device with dma_mask, remove dmalimit from tmsdev_init().

Kconfig: depend tms380tr and madgemc on MCA.
abyss.c, proteon.c, skisa.c, tmspci.c, tms380tr.h:
  remove dmalimit parameter from tmsdev_init().
tms380tr.c: use device->dma_mask instead of dmalimit.
madgemc.c: move to new MCA API using struct device.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Jochen Friedrich authored and Jeff Garzik committed Aug 20, 2005
1 parent 9f7f009 commit 84c3ea0
Show file tree
Hide file tree
Showing 8 changed files with 273 additions and 274 deletions.
4 changes: 2 additions & 2 deletions drivers/net/tokenring/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ config 3C359

config TMS380TR
tristate "Generic TMS380 Token Ring ISA/PCI adapter support"
depends on TR && (PCI || ISA)
depends on TR && (PCI || ISA || MCA)
select FW_LOADER
---help---
This driver provides generic support for token ring adapters
Expand Down Expand Up @@ -158,7 +158,7 @@ config ABYSS

config MADGEMC
tristate "Madge Smart 16/4 Ringnode MicroChannel"
depends on TR && TMS380TR && MCA_LEGACY
depends on TR && TMS380TR && MCA
help
This tms380 module supports the Madge Smart 16/4 MC16 and MC32
MicroChannel adapters.
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/tokenring/abyss.c
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->dev);
ret = tmsdev_init(dev, &pdev->dev);
if (ret) {
printk("%s: unable to get memory for dev->priv.\n",
dev->name);
Expand Down
Loading

0 comments on commit 84c3ea0

Please sign in to comment.