projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_conntrack/nf_nat: add TFTP helper port
[powerpc.git]
/
drivers
/
net
/
tulip
/
de2104x.c
diff --git
a/drivers/net/tulip/de2104x.c
b/drivers/net/tulip/de2104x.c
index
d05c5aa
..
9d67f11
100644
(file)
--- a/
drivers/net/tulip/de2104x.c
+++ b/
drivers/net/tulip/de2104x.c
@@
-484,7
+484,7
@@
rx_next:
de->rx_tail = rx_tail;
}
de->rx_tail = rx_tail;
}
-static irqreturn_t de_interrupt (int irq, void *dev_instance
, struct pt_regs *regs
)
+static irqreturn_t de_interrupt (int irq, void *dev_instance)
{
struct net_device *dev = dev_instance;
struct de_private *de = dev->priv;
{
struct net_device *dev = dev_instance;
struct de_private *de = dev->priv;
@@
-1670,7
+1670,7
@@
static void de_get_regs(struct net_device *dev, struct ethtool_regs *regs,
spin_unlock_irq(&de->lock);
}
spin_unlock_irq(&de->lock);
}
-static struct ethtool_ops de_ethtool_ops = {
+static
const
struct ethtool_ops de_ethtool_ops = {
.get_link = ethtool_op_get_link,
.get_tx_csum = ethtool_op_get_tx_csum,
.get_sg = ethtool_op_get_sg,
.get_link = ethtool_op_get_link,
.get_tx_csum = ethtool_op_get_tx_csum,
.get_sg = ethtool_op_get_sg,
@@
-1730,7
+1730,7
@@
static void __init de21040_get_media_info(struct de_private *de)
}
/* Note: this routine returns extra data bits for size detection. */
}
/* Note: this routine returns extra data bits for size detection. */
-static unsigned __init tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
+static unsigned __
dev
init tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
{
int i;
unsigned retval = 0;
{
int i;
unsigned retval = 0;
@@
-1906,9
+1906,7
@@
fill_defaults:
de->media[i].csr15 = t21041_csr15[i];
}
de->media[i].csr15 = t21041_csr15[i];
}
- de->ee_data = kmalloc(DE_EEPROM_SIZE, GFP_KERNEL);
- if (de->ee_data)
- memcpy(de->ee_data, &ee_data[0], DE_EEPROM_SIZE);
+ de->ee_data = kmemdup(&ee_data[0], DE_EEPROM_SIZE, GFP_KERNEL);
return;
return;
@@
-1926,7
+1924,7
@@
bad_srom:
goto fill_defaults;
}
goto fill_defaults;
}
-static int __init de_init_one (struct pci_dev *pdev,
+static int __
dev
init de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
const struct pci_device_id *ent)
{
struct net_device *dev;
@@
-2082,7
+2080,7
@@
err_out_free:
return rc;
}
return rc;
}
-static void __exit de_remove_one (struct pci_dev *pdev)
+static void __
dev
exit de_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv;
{
struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv;
@@
-2138,17
+2136,21
@@
static int de_resume (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata (pdev);
struct de_private *de = dev->priv;
{
struct net_device *dev = pci_get_drvdata (pdev);
struct de_private *de = dev->priv;
+ int retval = 0;
rtnl_lock();
if (netif_device_present(dev))
goto out;
rtnl_lock();
if (netif_device_present(dev))
goto out;
- if (
netif_running(dev)) {
-
pci_enable_device(pdev)
;
- de_init_hw(de);
- netif_device_attach(dev);
- } else {
-
netif_device_attach(dev)
;
+ if (
!netif_running(dev))
+
goto out_attach
;
+ if ((retval = pci_enable_device(pdev))) {
+ printk (KERN_ERR "%s: pci_enable_device failed in resume\n",
+ dev->name);
+
goto out
;
}
}
+ de_init_hw(de);
+out_attach:
+ netif_device_attach(dev);
out:
rtnl_unlock();
return 0;
out:
rtnl_unlock();
return 0;
@@
-2160,7
+2162,7
@@
static struct pci_driver de_driver = {
.name = DRV_NAME,
.id_table = de_pci_tbl,
.probe = de_init_one,
.name = DRV_NAME,
.id_table = de_pci_tbl,
.probe = de_init_one,
- .remove = __exit_p(de_remove_one),
+ .remove = __
dev
exit_p(de_remove_one),
#ifdef CONFIG_PM
.suspend = de_suspend,
.resume = de_resume,
#ifdef CONFIG_PM
.suspend = de_suspend,
.resume = de_resume,
@@
-2172,7
+2174,7
@@
static int __init de_init (void)
#ifdef MODULE
printk("%s", version);
#endif
#ifdef MODULE
printk("%s", version);
#endif
- return pci_
module_init
(&de_driver);
+ return pci_
register_driver
(&de_driver);
}
static void __exit de_exit (void)
}
static void __exit de_exit (void)