projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream-fixes
[powerpc.git]
/
drivers
/
net
/
tokenring
/
tmspci.c
diff --git
a/drivers/net/tokenring/tmspci.c
b/drivers/net/tokenring/tmspci.c
index
2e18c0a
..
3b2f00b
100644
(file)
--- a/
drivers/net/tokenring/tmspci.c
+++ b/
drivers/net/tokenring/tmspci.c
@@
-100,7
+100,7
@@
static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
unsigned int pci_irq_line;
unsigned long pci_ioaddr;
struct card_info *cardinfo = &card_info_table[ent->driver_data];
unsigned int pci_irq_line;
unsigned long pci_ioaddr;
struct card_info *cardinfo = &card_info_table[ent->driver_data];
-
+
if (versionprinted++ == 0)
printk("%s", version);
if (versionprinted++ == 0)
printk("%s", version);
@@
-122,7
+122,7
@@
static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
goto err_out_trdev;
}
goto err_out_trdev;
}
- ret = request_irq(pdev->irq, tms380tr_interrupt,
SA_SHIRQ
,
+ ret = request_irq(pdev->irq, tms380tr_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (ret)
goto err_out_region;
dev->name, dev);
if (ret)
goto err_out_region;
@@
-143,7
+143,7
@@
static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
printk(":%2.2x", dev->dev_addr[i]);
printk("\n");
printk(":%2.2x", dev->dev_addr[i]);
printk("\n");
- ret = tmsdev_init(dev,
PCI_MAX_ADDRESS, p
dev);
+ ret = tmsdev_init(dev,
&pdev->
dev);
if (ret) {
printk("%s: unable to get memory for dev->priv.\n", dev->name);
goto err_out_irq;
if (ret) {
printk("%s: unable to get memory for dev->priv.\n", dev->name);
goto err_out_irq;
@@
-224,8
+224,7
@@
static void __devexit tms_pci_detach (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
{
struct net_device *dev = pci_get_drvdata(pdev);
- if (!dev)
- BUG();
+ BUG_ON(!dev);
unregister_netdev(dev);
release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
free_irq(dev->irq, dev);
unregister_netdev(dev);
release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
free_irq(dev->irq, dev);