Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/orinoco/orinoco_nortel.c

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static int orinoco_nortel_init_one(struct pci_dev *pdev, 
	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_pci_card *card = priv->card;
@@ -288,7 +288,7 @@ static struct pci_driver orinoco_nortel_driver = { 
	.name		= DRIVER_NAME,

	.id_table	= orinoco_nortel_id_table,

	.probe		= orinoco_nortel_init_one,

	.remove		= __devexit_p(orinoco_nortel_remove_one),

	.remove		= orinoco_nortel_remove_one,

	.suspend	= orinoco_pci_suspend,

	.resume		= orinoco_pci_resume,

};

drivers/net/wireless/orinoco/orinoco_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, 
	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);
@@ -228,7 +228,7 @@ static struct pci_driver orinoco_pci_driver = { 
	.name		= DRIVER_NAME,

	.id_table	= orinoco_pci_id_table,

	.probe		= orinoco_pci_init_one,

	.remove		= __devexit_p(orinoco_pci_remove_one),

	.remove		= orinoco_pci_remove_one,

	.suspend	= orinoco_pci_suspend,

	.resume		= orinoco_pci_resume,

};

drivers/net/wireless/orinoco/orinoco_plx.c

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int orinoco_plx_init_one(struct pci_dev *pdev, 
	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_pci_card *card = priv->card;
@@ -334,7 +334,7 @@ static struct pci_driver orinoco_plx_driver = { 
	.name		= DRIVER_NAME,

	.id_table	= orinoco_plx_id_table,

	.probe		= orinoco_plx_init_one,

	.remove		= __devexit_p(orinoco_plx_remove_one),

	.remove		= orinoco_plx_remove_one,

	.suspend	= orinoco_pci_suspend,

	.resume		= orinoco_pci_resume,

};

drivers/net/wireless/orinoco/orinoco_tmd.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int orinoco_tmd_init_one(struct pci_dev *pdev, 
	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_pci_card *card = priv->card;
@@ -214,7 +214,7 @@ static struct pci_driver orinoco_tmd_driver = { 
	.name		= DRIVER_NAME,

	.id_table	= orinoco_tmd_id_table,

	.probe		= orinoco_tmd_init_one,

	.remove		= __devexit_p(orinoco_tmd_remove_one),

	.remove		= orinoco_tmd_remove_one,

	.suspend	= orinoco_pci_suspend,

	.resume		= orinoco_pci_resume,

};