From bbd7c7545df1a1a53a7c9e1bc8eaebb034559ca5 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:22:56 -0500 Subject: [PATCH] --- yaml --- r: 341759 b: refs/heads/master c: a9590879e12f920d8b2fc74c019b5d1604068862 h: refs/heads/master i: 341757: 0979c2d5a5662d47c9052af4d4fe82ae866b3f90 341755: afc0eb030244e97eb298ff19f1cb73db2776b357 341751: e0d529ba9e493ac6236a0e554510196f368a4d68 341743: 692f0b303a09e43d9456d7a442376064273ad609 341727: 1ba80e20d3774025789b8ac595c0f8d750f13831 341695: c9b3ac83b2b68555e708c278bef934b6eadd46f4 341631: 09ad6d3c3ae413478d968964ea8fed223493fb42 341503: 684d61f3954b15c0949ac06628eaf02cc99028cd v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/amd/pcnet32.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3c702dc4981e..d9853c16e097 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0c0e29d8c94fb483bf94a2157f1ef0a7fb70b55 +refs/heads/master: a9590879e12f920d8b2fc74c019b5d1604068862 diff --git a/trunk/drivers/net/ethernet/amd/pcnet32.c b/trunk/drivers/net/ethernet/amd/pcnet32.c index 86b6d8e4e6cd..a227ccdcb9b5 100644 --- a/trunk/drivers/net/ethernet/amd/pcnet32.c +++ b/trunk/drivers/net/ethernet/amd/pcnet32.c @@ -1443,7 +1443,7 @@ static const struct ethtool_ops pcnet32_ethtool_ops = { /* only probes for non-PCI devices, the rest are handled by * pci_register_driver via pcnet32_probe_pci */ -static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist) +static void pcnet32_probe_vlbus(unsigned int *pcnet32_portlist) { unsigned int *port, ioaddr; @@ -1462,7 +1462,7 @@ static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist) } } -static int __devinit +static int pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent) { unsigned long ioaddr; @@ -1521,7 +1521,7 @@ static const struct net_device_ops pcnet32_netdev_ops = { * Called from both pcnet32_probe_vlbus and pcnet_probe_pci. * pdev will be NULL when called from pcnet32_probe_vlbus. */ -static int __devinit +static int pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) { struct pcnet32_private *lp; @@ -2823,7 +2823,7 @@ static int pcnet32_pm_resume(struct pci_dev *pdev) return 0; } -static void __devexit pcnet32_remove_one(struct pci_dev *pdev) +static void pcnet32_remove_one(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); @@ -2844,7 +2844,7 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev) static struct pci_driver pcnet32_driver = { .name = DRV_NAME, .probe = pcnet32_probe_pci, - .remove = __devexit_p(pcnet32_remove_one), + .remove = pcnet32_remove_one, .id_table = pcnet32_pci_tbl, .suspend = pcnet32_pm_suspend, .resume = pcnet32_pm_resume,