UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wlcore/wl18xx/wl12xx: 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: Luciano Coelho <coelho@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bill Pemberton 2012-12-03 09:56:42 -05:00 committed by John W. Linville
parent fd549f135c
commit b74324d104
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ti/wl1251/sdio.c
View File

@ -305,7 +305,7 @@ out_free_hw:
return ret; return ret;
} }
static void __devexit wl1251_sdio_remove(struct sdio_func *func) static void wl1251_sdio_remove(struct sdio_func *func)
{ {
struct wl1251 *wl = sdio_get_drvdata(func); struct wl1251 *wl = sdio_get_drvdata(func);
struct wl1251_sdio *wl_sdio = wl->if_priv; struct wl1251_sdio *wl_sdio = wl->if_priv;
@ -347,7 +347,7 @@ static struct sdio_driver wl1251_sdio_driver = {
.name = "wl1251_sdio", .name = "wl1251_sdio",
.id_table = wl1251_devices, .id_table = wl1251_devices,
.probe = wl1251_sdio_probe, .probe = wl1251_sdio_probe,
.remove = __devexit_p(wl1251_sdio_remove), .remove = wl1251_sdio_remove,
.drv.pm = &wl1251_sdio_pm_ops, .drv.pm = &wl1251_sdio_pm_ops,
}; };

6
drivers/net/wireless/ti/wl1251/spi.c
View File

@ -237,7 +237,7 @@ static const struct wl1251_if_operations wl1251_spi_ops = {
.power = wl1251_spi_set_power, .power = wl1251_spi_set_power,
}; };
static int __devinit wl1251_spi_probe(struct spi_device *spi) static int wl1251_spi_probe(struct spi_device *spi)
{ {
struct wl12xx_platform_data *pdata; struct wl12xx_platform_data *pdata;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
@ -309,7 +309,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit wl1251_spi_remove(struct spi_device *spi) static int wl1251_spi_remove(struct spi_device *spi)
{ {
struct wl1251 *wl = dev_get_drvdata(&spi->dev); struct wl1251 *wl = dev_get_drvdata(&spi->dev);
@ -326,7 +326,7 @@ static struct spi_driver wl1251_spi_driver = {
}, },
.probe = wl1251_spi_probe, .probe = wl1251_spi_probe,
.remove = __devexit_p(wl1251_spi_remove), .remove = wl1251_spi_remove,
}; };
static int __init wl1251_spi_init(void) static int __init wl1251_spi_init(void)

6
drivers/net/wireless/ti/wl12xx/main.c
View File

@ -1696,7 +1696,7 @@ static int wl12xx_setup(struct wl1271 *wl)
return 0; return 0;
} }
static int __devinit wl12xx_probe(struct platform_device *pdev) static int wl12xx_probe(struct platform_device *pdev)
{ {
struct wl1271 *wl; struct wl1271 *wl;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
@ -1725,7 +1725,7 @@ out:
return ret; return ret;
} }
static const struct platform_device_id wl12xx_id_table[] __devinitconst = { static const struct platform_device_id wl12xx_id_table[] = {
{ "wl12xx", 0 }, { "wl12xx", 0 },
{ } /* Terminating Entry */ { } /* Terminating Entry */
}; };
@ -1733,7 +1733,7 @@ MODULE_DEVICE_TABLE(platform, wl12xx_id_table);
static struct platform_driver wl12xx_driver = { static struct platform_driver wl12xx_driver = {
.probe = wl12xx_probe, .probe = wl12xx_probe,
.remove = __devexit_p(wlcore_remove), .remove = wlcore_remove,
.id_table = wl12xx_id_table, .id_table = wl12xx_id_table,
.driver = { .driver = {
.name = "wl12xx_driver", .name = "wl12xx_driver",

6
drivers/net/wireless/ti/wl18xx/main.c
View File

@ -1499,7 +1499,7 @@ static int wl18xx_setup(struct wl1271 *wl)
return 0; return 0;
} }
static int __devinit wl18xx_probe(struct platform_device *pdev) static int wl18xx_probe(struct platform_device *pdev)
{ {
struct wl1271 *wl; struct wl1271 *wl;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
@ -1528,7 +1528,7 @@ out:
return ret; return ret;
} }
static const struct platform_device_id wl18xx_id_table[] __devinitconst = { static const struct platform_device_id wl18xx_id_table[] = {
{ "wl18xx", 0 }, { "wl18xx", 0 },
{ } /* Terminating Entry */ { } /* Terminating Entry */
}; };
@ -1536,7 +1536,7 @@ MODULE_DEVICE_TABLE(platform, wl18xx_id_table);
static struct platform_driver wl18xx_driver = { static struct platform_driver wl18xx_driver = {
.probe = wl18xx_probe, .probe = wl18xx_probe,
.remove = __devexit_p(wlcore_remove), .remove = wlcore_remove,
.id_table = wl18xx_id_table, .id_table = wl18xx_id_table,
.driver = { .driver = {
.name = "wl18xx_driver", .name = "wl18xx_driver",

4
drivers/net/wireless/ti/wlcore/main.c
View File

@ -5660,7 +5660,7 @@ out:
complete_all(&wl->nvs_loading_complete); complete_all(&wl->nvs_loading_complete);
} }
int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
{ {
int ret; int ret;
@ -5683,7 +5683,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
} }
EXPORT_SYMBOL_GPL(wlcore_probe); EXPORT_SYMBOL_GPL(wlcore_probe);
int __devexit wlcore_remove(struct platform_device *pdev) int wlcore_remove(struct platform_device *pdev)
{ {
struct wl1271 *wl = platform_get_drvdata(pdev); struct wl1271 *wl = platform_get_drvdata(pdev);

8
drivers/net/wireless/ti/wlcore/sdio.c
View File

@ -54,7 +54,7 @@ struct wl12xx_sdio_glue {
struct platform_device *core; struct platform_device *core;
}; };
static const struct sdio_device_id wl1271_devices[] __devinitconst = { static const struct sdio_device_id wl1271_devices[] = {
{ SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) }, { SDIO_DEVICE(SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271) },
{} {}
}; };
@ -214,7 +214,7 @@ static struct wl1271_if_operations sdio_ops = {
.set_block_size = wl1271_sdio_set_block_size, .set_block_size = wl1271_sdio_set_block_size,
}; };
static int __devinit wl1271_probe(struct sdio_func *func, static int wl1271_probe(struct sdio_func *func,
const struct sdio_device_id *id) const struct sdio_device_id *id)
{ {
struct wl12xx_platform_data *wlan_data; struct wl12xx_platform_data *wlan_data;
@ -319,7 +319,7 @@ out:
return ret; return ret;
} }
static void __devexit wl1271_remove(struct sdio_func *func) static void wl1271_remove(struct sdio_func *func)
{ {
struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func); struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
@ -384,7 +384,7 @@ static struct sdio_driver wl1271_sdio_driver = {
.name = "wl1271_sdio", .name = "wl1271_sdio",
.id_table = wl1271_devices, .id_table = wl1271_devices,
.probe = wl1271_probe, .probe = wl1271_probe,
.remove = __devexit_p(wl1271_remove), .remove = wl1271_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.drv = { .drv = {
.pm = &wl1271_sdio_pm_ops, .pm = &wl1271_sdio_pm_ops,

6
drivers/net/wireless/ti/wlcore/spi.c
View File

@ -324,7 +324,7 @@ static struct wl1271_if_operations spi_ops = {
.set_block_size = NULL, .set_block_size = NULL,
}; };
static int __devinit wl1271_probe(struct spi_device *spi) static int wl1271_probe(struct spi_device *spi)
{ {
struct wl12xx_spi_glue *glue; struct wl12xx_spi_glue *glue;
struct wl12xx_platform_data *pdata; struct wl12xx_platform_data *pdata;
@ -403,7 +403,7 @@ out:
return ret; return ret;
} }
static int __devexit wl1271_remove(struct spi_device *spi) static int wl1271_remove(struct spi_device *spi)
{ {
struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); struct wl12xx_spi_glue *glue = spi_get_drvdata(spi);
@ -422,7 +422,7 @@ static struct spi_driver wl1271_spi_driver = {
}, },
.probe = wl1271_probe, .probe = wl1271_probe,
.remove = __devexit_p(wl1271_remove), .remove = wl1271_remove,
}; };
static int __init wl1271_init(void) static int __init wl1271_init(void)

4
drivers/net/wireless/ti/wlcore/wlcore.h
View File

@ -414,8 +414,8 @@ struct wl1271 {
struct completion nvs_loading_complete; struct completion nvs_loading_complete;
}; };
int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev); int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
int __devexit wlcore_remove(struct platform_device *pdev); int wlcore_remove(struct platform_device *pdev);
struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size); struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size);
int wlcore_free_hw(struct wl1271 *wl); int wlcore_free_hw(struct wl1271 *wl);
int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd, int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,