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

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

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: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Luciano Coelho <coelho@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd549f13

drivers/net/wireless/ti/wl1251/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, 
	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_sdio *wl_sdio = wl->if_priv;
@@ -347,7 +347,7 @@ static struct sdio_driver wl1251_sdio_driver = { 
	.name		= "wl1251_sdio",

	.id_table	= wl1251_devices,

	.probe		= wl1251_sdio_probe,

	.remove		= __devexit_p(wl1251_sdio_remove),

	.remove		= wl1251_sdio_remove,

	.drv.pm		= &wl1251_sdio_pm_ops,

};

drivers/net/wireless/ti/wl1251/spi.c

+3 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static const struct wl1251_if_operations wl1251_spi_ops = { 
	.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 ieee80211_hw *hw;
@@ -309,7 +309,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi) 
	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);
@@ -326,7 +326,7 @@ static struct spi_driver wl1251_spi_driver = { 
	},



	.probe		= wl1251_spi_probe,

	.remove		= __devexit_p(wl1251_spi_remove),

	.remove		= wl1251_spi_remove,

};



static int __init wl1251_spi_init(void)

drivers/net/wireless/ti/wl12xx/main.c

+3 −3
Original line number Diff line number Diff line
@@ -1696,7 +1696,7 @@ static int wl12xx_setup(struct wl1271 *wl) 
	return 0;

}



static int __devinit wl12xx_probe(struct platform_device *pdev)

static int wl12xx_probe(struct platform_device *pdev)

{

	struct wl1271 *wl;

	struct ieee80211_hw *hw;
@@ -1725,7 +1725,7 @@ static int __devinit wl12xx_probe(struct platform_device *pdev) 
	return ret;

}



static const struct platform_device_id wl12xx_id_table[] __devinitconst = {

static const struct platform_device_id wl12xx_id_table[] = {

	{ "wl12xx", 0 },

	{  } /* Terminating Entry */

};
@@ -1733,7 +1733,7 @@ MODULE_DEVICE_TABLE(platform, wl12xx_id_table); 


static struct platform_driver wl12xx_driver = {

	.probe		= wl12xx_probe,

	.remove		= __devexit_p(wlcore_remove),

	.remove		= wlcore_remove,

	.id_table	= wl12xx_id_table,

	.driver = {

		.name	= "wl12xx_driver",

drivers/net/wireless/ti/wl18xx/main.c

+3 −3
Original line number Diff line number Diff line
@@ -1499,7 +1499,7 @@ static int wl18xx_setup(struct wl1271 *wl) 
	return 0;

}



static int __devinit wl18xx_probe(struct platform_device *pdev)

static int wl18xx_probe(struct platform_device *pdev)

{

	struct wl1271 *wl;

	struct ieee80211_hw *hw;
@@ -1528,7 +1528,7 @@ static int __devinit wl18xx_probe(struct platform_device *pdev) 
	return ret;

}



static const struct platform_device_id wl18xx_id_table[] __devinitconst = {

static const struct platform_device_id wl18xx_id_table[] = {

	{ "wl18xx", 0 },

	{  } /* Terminating Entry */

};
@@ -1536,7 +1536,7 @@ MODULE_DEVICE_TABLE(platform, wl18xx_id_table); 


static struct platform_driver wl18xx_driver = {

	.probe		= wl18xx_probe,

	.remove		= __devexit_p(wlcore_remove),

	.remove		= wlcore_remove,

	.id_table	= wl18xx_id_table,

	.driver = {

		.name	= "wl18xx_driver",

drivers/net/wireless/ti/wlcore/main.c

+2 −2
Original line number Diff line number Diff line
@@ -5660,7 +5660,7 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) 
	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;
@@ -5683,7 +5683,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev) 
}

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);