aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/lmc
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/net/wan/lmc
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'drivers/net/wan/lmc')
-rw-r--r--drivers/net/wan/lmc/lmc_main.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ef435bab42..b7f2358d23b 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -497,6 +497,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
497 497
498 data = kmalloc(xc.len, GFP_KERNEL); 498 data = kmalloc(xc.len, GFP_KERNEL);
499 if (!data) { 499 if (!data) {
500 printk(KERN_WARNING "%s: Failed to allocate memory for copy\n", dev->name);
500 ret = -ENOMEM; 501 ret = -ENOMEM;
501 break; 502 break;
502 } 503 }
@@ -816,7 +817,8 @@ static const struct net_device_ops lmc_ops = {
816 .ndo_get_stats = lmc_get_stats, 817 .ndo_get_stats = lmc_get_stats,
817}; 818};
818 819
819static int lmc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 820static int __devinit lmc_init_one(struct pci_dev *pdev,
821 const struct pci_device_id *ent)
820{ 822{
821 lmc_softc_t *sc; 823 lmc_softc_t *sc;
822 struct net_device *dev; 824 struct net_device *dev;
@@ -985,7 +987,7 @@ err_req_io:
985/* 987/*
986 * Called from pci when removing module. 988 * Called from pci when removing module.
987 */ 989 */
988static void lmc_remove_one(struct pci_dev *pdev) 990static void __devexit lmc_remove_one(struct pci_dev *pdev)
989{ 991{
990 struct net_device *dev = pci_get_drvdata(pdev); 992 struct net_device *dev = pci_get_drvdata(pdev);
991 993
@@ -1119,7 +1121,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
1119{ 1121{
1120 lmc_softc_t *sc = dev_to_sc(dev); 1122 lmc_softc_t *sc = dev_to_sc(dev);
1121 1123
1122 lmc_trace(dev, "lmc_running_reset in"); 1124 lmc_trace(dev, "lmc_runnig_reset in");
1123 1125
1124 /* stop interrupts */ 1126 /* stop interrupts */
1125 /* Clear the interrupt mask */ 1127 /* Clear the interrupt mask */
@@ -1732,10 +1734,21 @@ static struct pci_driver lmc_driver = {
1732 .name = "lmc", 1734 .name = "lmc",
1733 .id_table = lmc_pci_tbl, 1735 .id_table = lmc_pci_tbl,
1734 .probe = lmc_init_one, 1736 .probe = lmc_init_one,
1735 .remove = lmc_remove_one, 1737 .remove = __devexit_p(lmc_remove_one),
1736}; 1738};
1737 1739
1738module_pci_driver(lmc_driver); 1740static int __init init_lmc(void)
1741{
1742 return pci_register_driver(&lmc_driver);
1743}
1744
1745static void __exit exit_lmc(void)
1746{
1747 pci_unregister_driver(&lmc_driver);
1748}
1749
1750module_init(init_lmc);
1751module_exit(exit_lmc);
1739 1752
1740unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno) /*fold00*/ 1753unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno) /*fold00*/
1741{ 1754{