diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:47 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:53 -0500 |
| commit | b38d13066020a5390b59d1b740b7985d548bfb5b (patch) | |
| tree | bfdb910d8cbe5fe95184fe7a63f01c106c77689b /drivers | |
| parent | 17abe3e4c67bfbf20e870be9c8b4634c12f73018 (diff) | |
tc35815: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/toshiba/tc35815.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index 651a70c55e6e..5db09efae927 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c | |||
| @@ -60,7 +60,7 @@ enum tc35815_chiptype { | |||
| 60 | /* indexed by tc35815_chiptype, above */ | 60 | /* indexed by tc35815_chiptype, above */ |
| 61 | static const struct { | 61 | static const struct { |
| 62 | const char *name; | 62 | const char *name; |
| 63 | } chip_info[] __devinitdata = { | 63 | } chip_info[] = { |
| 64 | { "TOSHIBA TC35815CF 10/100BaseTX" }, | 64 | { "TOSHIBA TC35815CF 10/100BaseTX" }, |
| 65 | { "TOSHIBA TC35815 with Wake on LAN" }, | 65 | { "TOSHIBA TC35815 with Wake on LAN" }, |
| 66 | { "TOSHIBA TC35815/TX4939" }, | 66 | { "TOSHIBA TC35815/TX4939" }, |
| @@ -719,7 +719,7 @@ err_out: | |||
| 719 | * should provide a "tc35815-mac" device with a MAC address in its | 719 | * should provide a "tc35815-mac" device with a MAC address in its |
| 720 | * platform_data. | 720 | * platform_data. |
| 721 | */ | 721 | */ |
| 722 | static int __devinit tc35815_mac_match(struct device *dev, void *data) | 722 | static int tc35815_mac_match(struct device *dev, void *data) |
| 723 | { | 723 | { |
| 724 | struct platform_device *plat_dev = to_platform_device(dev); | 724 | struct platform_device *plat_dev = to_platform_device(dev); |
| 725 | struct pci_dev *pci_dev = data; | 725 | struct pci_dev *pci_dev = data; |
| @@ -727,7 +727,7 @@ static int __devinit tc35815_mac_match(struct device *dev, void *data) | |||
| 727 | return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id; | 727 | return !strcmp(plat_dev->name, "tc35815-mac") && plat_dev->id == id; |
| 728 | } | 728 | } |
| 729 | 729 | ||
| 730 | static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev) | 730 | static int tc35815_read_plat_dev_addr(struct net_device *dev) |
| 731 | { | 731 | { |
| 732 | struct tc35815_local *lp = netdev_priv(dev); | 732 | struct tc35815_local *lp = netdev_priv(dev); |
| 733 | struct device *pd = bus_find_device(&platform_bus_type, NULL, | 733 | struct device *pd = bus_find_device(&platform_bus_type, NULL, |
| @@ -741,13 +741,13 @@ static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev) | |||
| 741 | return -ENODEV; | 741 | return -ENODEV; |
| 742 | } | 742 | } |
| 743 | #else | 743 | #else |
| 744 | static int __devinit tc35815_read_plat_dev_addr(struct net_device *dev) | 744 | static int tc35815_read_plat_dev_addr(struct net_device *dev) |
| 745 | { | 745 | { |
| 746 | return -ENODEV; | 746 | return -ENODEV; |
| 747 | } | 747 | } |
| 748 | #endif | 748 | #endif |
| 749 | 749 | ||
| 750 | static int __devinit tc35815_init_dev_addr(struct net_device *dev) | 750 | static int tc35815_init_dev_addr(struct net_device *dev) |
| 751 | { | 751 | { |
| 752 | struct tc35815_regs __iomem *tr = | 752 | struct tc35815_regs __iomem *tr = |
| 753 | (struct tc35815_regs __iomem *)dev->base_addr; | 753 | (struct tc35815_regs __iomem *)dev->base_addr; |
| @@ -785,7 +785,7 @@ static const struct net_device_ops tc35815_netdev_ops = { | |||
| 785 | #endif | 785 | #endif |
| 786 | }; | 786 | }; |
| 787 | 787 | ||
| 788 | static int __devinit tc35815_init_one(struct pci_dev *pdev, | 788 | static int tc35815_init_one(struct pci_dev *pdev, |
| 789 | const struct pci_device_id *ent) | 789 | const struct pci_device_id *ent) |
| 790 | { | 790 | { |
| 791 | void __iomem *ioaddr = NULL; | 791 | void __iomem *ioaddr = NULL; |
| @@ -878,7 +878,7 @@ err_out: | |||
| 878 | } | 878 | } |
| 879 | 879 | ||
| 880 | 880 | ||
| 881 | static void __devexit tc35815_remove_one(struct pci_dev *pdev) | 881 | static void tc35815_remove_one(struct pci_dev *pdev) |
| 882 | { | 882 | { |
| 883 | struct net_device *dev = pci_get_drvdata(pdev); | 883 | struct net_device *dev = pci_get_drvdata(pdev); |
| 884 | struct tc35815_local *lp = netdev_priv(dev); | 884 | struct tc35815_local *lp = netdev_priv(dev); |
| @@ -2198,7 +2198,7 @@ static struct pci_driver tc35815_pci_driver = { | |||
| 2198 | .name = MODNAME, | 2198 | .name = MODNAME, |
| 2199 | .id_table = tc35815_pci_tbl, | 2199 | .id_table = tc35815_pci_tbl, |
| 2200 | .probe = tc35815_init_one, | 2200 | .probe = tc35815_init_one, |
| 2201 | .remove = __devexit_p(tc35815_remove_one), | 2201 | .remove = tc35815_remove_one, |
| 2202 | #ifdef CONFIG_PM | 2202 | #ifdef CONFIG_PM |
| 2203 | .suspend = tc35815_suspend, | 2203 | .suspend = tc35815_suspend, |
| 2204 | .resume = tc35815_resume, | 2204 | .resume = tc35815_resume, |