|
@@ -2361,7 +2361,7 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
|
* via a printk and leave the corresponding interface and all that follow
|
|
|
* disabled.
|
|
|
*/
|
|
|
-static char *type_strings[] __devinitdata = {
|
|
|
+static char *type_strings[] = {
|
|
|
"no hardware", /* Should never be seen */
|
|
|
"FarSync T2P",
|
|
|
"FarSync T4P",
|
|
@@ -2371,7 +2371,7 @@ static char *type_strings[] __devinitdata = {
|
|
|
"FarSync TE1"
|
|
|
};
|
|
|
|
|
|
-static void __devinit
|
|
|
+static void
|
|
|
fst_init_card(struct fst_card_info *card)
|
|
|
{
|
|
|
int i;
|
|
@@ -2415,7 +2415,7 @@ static const struct net_device_ops fst_ops = {
|
|
|
* Initialise card when detected.
|
|
|
* Returns 0 to indicate success, or errno otherwise.
|
|
|
*/
|
|
|
-static int __devinit
|
|
|
+static int
|
|
|
fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
{
|
|
|
static int no_of_cards_added = 0;
|
|
@@ -2615,7 +2615,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
/*
|
|
|
* Cleanup and close down a card
|
|
|
*/
|
|
|
-static void __devexit
|
|
|
+static void
|
|
|
fst_remove_one(struct pci_dev *pdev)
|
|
|
{
|
|
|
struct fst_card_info *card;
|
|
@@ -2652,7 +2652,7 @@ static struct pci_driver fst_driver = {
|
|
|
.name = FST_NAME,
|
|
|
.id_table = fst_pci_dev_id,
|
|
|
.probe = fst_add_one,
|
|
|
- .remove = __devexit_p(fst_remove_one),
|
|
|
+ .remove = fst_remove_one,
|
|
|
.suspend = NULL,
|
|
|
.resume = NULL,
|
|
|
};
|