Commit baa366cd authored by Bill Pemberton's avatar Bill Pemberton Committed by John W. Linville

orinoco: 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: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8dee5eef
...@@ -255,7 +255,7 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev, ...@@ -255,7 +255,7 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev) static void orinoco_nortel_remove_one(struct pci_dev *pdev)
{ {
struct orinoco_private *priv = pci_get_drvdata(pdev); struct orinoco_private *priv = pci_get_drvdata(pdev);
struct orinoco_pci_card *card = priv->card; struct orinoco_pci_card *card = priv->card;
...@@ -288,7 +288,7 @@ static struct pci_driver orinoco_nortel_driver = { ...@@ -288,7 +288,7 @@ static struct pci_driver orinoco_nortel_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = orinoco_nortel_id_table, .id_table = orinoco_nortel_id_table,
.probe = orinoco_nortel_init_one, .probe = orinoco_nortel_init_one,
.remove = __devexit_p(orinoco_nortel_remove_one), .remove = orinoco_nortel_remove_one,
.suspend = orinoco_pci_suspend, .suspend = orinoco_pci_suspend,
.resume = orinoco_pci_resume, .resume = orinoco_pci_resume,
}; };
......
...@@ -199,7 +199,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, ...@@ -199,7 +199,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit orinoco_pci_remove_one(struct pci_dev *pdev) static void orinoco_pci_remove_one(struct pci_dev *pdev)
{ {
struct orinoco_private *priv = pci_get_drvdata(pdev); struct orinoco_private *priv = pci_get_drvdata(pdev);
...@@ -228,7 +228,7 @@ static struct pci_driver orinoco_pci_driver = { ...@@ -228,7 +228,7 @@ static struct pci_driver orinoco_pci_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = orinoco_pci_id_table, .id_table = orinoco_pci_id_table,
.probe = orinoco_pci_init_one, .probe = orinoco_pci_init_one,
.remove = __devexit_p(orinoco_pci_remove_one), .remove = orinoco_pci_remove_one,
.suspend = orinoco_pci_suspend, .suspend = orinoco_pci_suspend,
.resume = orinoco_pci_resume, .resume = orinoco_pci_resume,
}; };
......
...@@ -294,7 +294,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, ...@@ -294,7 +294,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit orinoco_plx_remove_one(struct pci_dev *pdev) static void orinoco_plx_remove_one(struct pci_dev *pdev)
{ {
struct orinoco_private *priv = pci_get_drvdata(pdev); struct orinoco_private *priv = pci_get_drvdata(pdev);
struct orinoco_pci_card *card = priv->card; struct orinoco_pci_card *card = priv->card;
...@@ -334,7 +334,7 @@ static struct pci_driver orinoco_plx_driver = { ...@@ -334,7 +334,7 @@ static struct pci_driver orinoco_plx_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = orinoco_plx_id_table, .id_table = orinoco_plx_id_table,
.probe = orinoco_plx_init_one, .probe = orinoco_plx_init_one,
.remove = __devexit_p(orinoco_plx_remove_one), .remove = orinoco_plx_remove_one,
.suspend = orinoco_pci_suspend, .suspend = orinoco_pci_suspend,
.resume = orinoco_pci_resume, .resume = orinoco_pci_resume,
}; };
......
...@@ -188,7 +188,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, ...@@ -188,7 +188,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit orinoco_tmd_remove_one(struct pci_dev *pdev) static void orinoco_tmd_remove_one(struct pci_dev *pdev)
{ {
struct orinoco_private *priv = pci_get_drvdata(pdev); struct orinoco_private *priv = pci_get_drvdata(pdev);
struct orinoco_pci_card *card = priv->card; struct orinoco_pci_card *card = priv->card;
...@@ -214,7 +214,7 @@ static struct pci_driver orinoco_tmd_driver = { ...@@ -214,7 +214,7 @@ static struct pci_driver orinoco_tmd_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = orinoco_tmd_id_table, .id_table = orinoco_tmd_id_table,
.probe = orinoco_tmd_init_one, .probe = orinoco_tmd_init_one,
.remove = __devexit_p(orinoco_tmd_remove_one), .remove = orinoco_tmd_remove_one,
.suspend = orinoco_pci_suspend, .suspend = orinoco_pci_suspend,
.resume = orinoco_pci_resume, .resume = orinoco_pci_resume,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment