[Acx100-devel] [PATCH] remove usage of __devinit, __devexit and __devexit_p

[Hauke M. <ha...@ha...>]

These attributes where removed with kernel 3.8.

Signed-off-by: Hauke Mehrtens <ha...@ha...>
---
 mem.c |    6 +++---
 pci.c |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mem.c b/mem.c
index 87e01f1..923488a 100644
--- a/mem.c
+++ b/mem.c
@@ -2216,7 +2216,7 @@ int acx100mem_ioctl_set_phy_amp_bias(struct ieee80211_hw *hw,
  * ==================================================
  */
 
-static int __devinit acxmem_probe(struct platform_device *pdev)
+static int acxmem_probe(struct platform_device *pdev)
 {
 	acx_device_t *adev = NULL;
 	const char *chip_name;
@@ -2392,7 +2392,7 @@ static int __devinit acxmem_probe(struct platform_device *pdev)
  * pdev - ptr to PCI device structure containing info about pci
  * configuration
  */
-static int __devexit acxmem_remove(struct platform_device *pdev)
+static int acxmem_remove(struct platform_device *pdev)
 {
 	struct ieee80211_hw *hw = (struct ieee80211_hw *)
 		platform_get_drvdata(pdev);
@@ -2594,7 +2594,7 @@ static struct platform_driver acxmem_driver = {
 		.name = "acx-mem",
 	},
 	.probe = acxmem_probe,
-	.remove = __devexit_p(acxmem_remove),
+	.remove = acxmem_remove,
 
 #ifdef CONFIG_PM
 	.suspend = acxmem_e_suspend,
diff --git a/pci.c b/pci.c
index ab09758..db12352 100644
--- a/pci.c
+++ b/pci.c
@@ -1039,7 +1039,7 @@ int acx100pci_ioctl_set_phy_amp_bias(struct net_device *ndev,
  * id	- ptr to the device id entry that matched this device
  */
 #ifdef CONFIG_PCI
-static int __devinit acxpci_probe(struct pci_dev *pdev,
+static int acxpci_probe(struct pci_dev *pdev,
 				const struct pci_device_id *id)
 {
 	unsigned long mem_region1 = 0;
@@ -1292,7 +1292,7 @@ static int __devinit acxpci_probe(struct pci_dev *pdev,
  *
  * pdev - ptr to PCI device structure containing info about pci configuration
  */
-static void __devexit acxpci_remove(struct pci_dev *pdev)
+static void acxpci_remove(struct pci_dev *pdev)
 {
 	struct ieee80211_hw *hw
 		= (struct ieee80211_hw *) pci_get_drvdata(pdev);
@@ -1478,7 +1478,7 @@ static int acxpci_e_resume(struct pci_dev *pdev)
  */
 
 #if 0 // use later ?
-static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
+static struct acxpci_device_info acxpci_info_tbl[] = {
         [0] = {
                 .part_name      = "acx111",
                 .helper_image   = "tiacx1111r16", // probly wrong !!
@@ -1505,7 +1505,7 @@ static struct pci_driver acxpci_driver = {
 	.name		= "acx_pci",
 	.id_table	= acxpci_id_tbl,
 	.probe		= acxpci_probe,
-	.remove		= __devexit_p(acxpci_remove),
+	.remove		= acxpci_remove,
 #ifdef CONFIG_PM
 	.suspend	= acxpci_e_suspend,
 	.resume		= acxpci_e_resume
@@ -1603,7 +1603,7 @@ static struct vlynq_device_id acx_vlynq_id[] = {
 };
 
 
-static __devinit int vlynq_probe(struct vlynq_device *vdev,
+static int vlynq_probe(struct vlynq_device *vdev,
 				 struct vlynq_device_id *id)
 {
 	int result = -EIO, i;
@@ -1851,7 +1851,7 @@ static struct vlynq_driver vlynq_acx = {
 	.name = "acx_vlynq",
 	.id_table = acx_vlynq_id,
 	.probe = vlynq_probe,
-	.remove = __devexit_p(vlynq_remove),
+	.remove = vlynq_remove,
 };
 #endif /* CONFIG_VLYNQ */
 
-- 
1.7.10.4