diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:24:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:17:06 -0500 |
commit | 5a37931ff0be06b4c774aa604f86ed4566a0ede7 (patch) | |
tree | 3f8a209ae1e6156bec1186db30579887ce3c94a0 /drivers/net/wan | |
parent | 6ad888c679ff7b4143e8a89706a5c097004b168a (diff) |
farsync: 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>
Cc: Kevin Curtis <kevin.curtis@farsite.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/farsync.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index b6271325f803..56941d6547eb 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -2361,7 +2361,7 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2361 | * via a printk and leave the corresponding interface and all that follow | 2361 | * via a printk and leave the corresponding interface and all that follow |
2362 | * disabled. | 2362 | * disabled. |
2363 | */ | 2363 | */ |
2364 | static char *type_strings[] __devinitdata = { | 2364 | static char *type_strings[] = { |
2365 | "no hardware", /* Should never be seen */ | 2365 | "no hardware", /* Should never be seen */ |
2366 | "FarSync T2P", | 2366 | "FarSync T2P", |
2367 | "FarSync T4P", | 2367 | "FarSync T4P", |
@@ -2371,7 +2371,7 @@ static char *type_strings[] __devinitdata = { | |||
2371 | "FarSync TE1" | 2371 | "FarSync TE1" |
2372 | }; | 2372 | }; |
2373 | 2373 | ||
2374 | static void __devinit | 2374 | static void |
2375 | fst_init_card(struct fst_card_info *card) | 2375 | fst_init_card(struct fst_card_info *card) |
2376 | { | 2376 | { |
2377 | int i; | 2377 | int i; |
@@ -2415,7 +2415,7 @@ static const struct net_device_ops fst_ops = { | |||
2415 | * Initialise card when detected. | 2415 | * Initialise card when detected. |
2416 | * Returns 0 to indicate success, or errno otherwise. | 2416 | * Returns 0 to indicate success, or errno otherwise. |
2417 | */ | 2417 | */ |
2418 | static int __devinit | 2418 | static int |
2419 | fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent) | 2419 | fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
2420 | { | 2420 | { |
2421 | static int no_of_cards_added = 0; | 2421 | static int no_of_cards_added = 0; |
@@ -2615,7 +2615,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2615 | /* | 2615 | /* |
2616 | * Cleanup and close down a card | 2616 | * Cleanup and close down a card |
2617 | */ | 2617 | */ |
2618 | static void __devexit | 2618 | static void |
2619 | fst_remove_one(struct pci_dev *pdev) | 2619 | fst_remove_one(struct pci_dev *pdev) |
2620 | { | 2620 | { |
2621 | struct fst_card_info *card; | 2621 | struct fst_card_info *card; |
@@ -2652,7 +2652,7 @@ static struct pci_driver fst_driver = { | |||
2652 | .name = FST_NAME, | 2652 | .name = FST_NAME, |
2653 | .id_table = fst_pci_dev_id, | 2653 | .id_table = fst_pci_dev_id, |
2654 | .probe = fst_add_one, | 2654 | .probe = fst_add_one, |
2655 | .remove = __devexit_p(fst_remove_one), | 2655 | .remove = fst_remove_one, |
2656 | .suspend = NULL, | 2656 | .suspend = NULL, |
2657 | .resume = NULL, | 2657 | .resume = NULL, |
2658 | }; | 2658 | }; |