leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wl1271: Move platform device registration from _spi to _main

Browse Source 
In order to get the platform device for both SPI and SDIO, move the platform
device registration to wl1271_main.c from wl1271_spi.c.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Juuso Oikarinen 2010-03-18 12:26:31 +02:00 committed by John W. Linville
parent 1b00f546fc
commit a1dd8187d8
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/wireless/wl12xx/wl1271_main.c
View File

@ -29,6 +29,7 @@
#include <linux/etherdevice.h>
#include <linux/vmalloc.h>
#include <linux/inetdevice.h>
#include <linux/platform_device.h>
#include "wl1271.h"
#include "wl12xx_80211.h"
@ -280,6 +281,21 @@ static struct conf_drv_settings default_conf = {
}
};
static void wl1271_device_release(struct device *dev)
{
}
static struct platform_device wl1271_device = {
.name = "wl1271",
.id = -1,
/* device model insists to have a release function */
.dev = {
.release = wl1271_device_release,
},
};
static LIST_HEAD(wl_list);
static void wl1271_conf_init(struct wl1271 *wl)
@ -2025,12 +2041,13 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
{
struct ieee80211_hw *hw;
struct wl1271 *wl;
int i;
int i, ret;
hw = ieee80211_alloc_hw(sizeof(*wl), &wl1271_ops);
if (!hw) {
wl1271_error("could not alloc ieee80211_hw");
return ERR_PTR(-ENOMEM);
ret = -ENOMEM;
goto err;
}
wl = hw->priv;
@ -2070,12 +2087,28 @@ struct ieee80211_hw *wl1271_alloc_hw(void)
wl1271_debugfs_init(wl);
/* Register platform device */
ret = platform_device_register(&wl1271_device);
if (ret) {
wl1271_error("couldn't register platform device");
goto err_hw;
}
dev_set_drvdata(&wl1271_device.dev, wl);
return hw;
err_hw:
ieee80211_unregister_hw(wl->hw);
err:
return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(wl1271_alloc_hw);
int wl1271_free_hw(struct wl1271 *wl)
{
platform_device_unregister(&wl1271_device);
ieee80211_unregister_hw(wl->hw);
wl1271_debugfs_exit(wl);

31
drivers/net/wireless/wl12xx/wl1271_spi.c
View File

@ -23,7 +23,6 @@
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/crc7.h>
#include <linux/spi/spi.h>
#include <linux/spi/wl12xx.h>
@ -332,21 +331,6 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
return IRQ_HANDLED;
}
static void wl1271_device_release(struct device *dev)
{
}
static struct platform_device wl1271_device = {
.name = "wl1271",
.id = -1,
/* device model insists to have a release function */
.dev = {
.release = wl1271_device_release,
},
};
static void wl1271_spi_set_power(struct wl1271 *wl, bool enable)
{
if (wl->set_power)
@ -422,28 +406,18 @@ static int __devinit wl1271_probe(struct spi_device *spi)
disable_irq(wl->irq);
ret = platform_device_register(&wl1271_device);
if (ret) {
wl1271_error("couldn't register platform device");
goto out_irq;
}
dev_set_drvdata(&wl1271_device.dev, wl);
ret = wl1271_init_ieee80211(wl);
if (ret)
goto out_platform;
goto out_irq;
ret = wl1271_register_hw(wl);
if (ret)
goto out_platform;
goto out_irq;
wl1271_notice("initialized");
return 0;
out_platform:
platform_device_unregister(&wl1271_device);
out_irq:
free_irq(wl->irq, wl);
@ -457,7 +431,6 @@ static int __devexit wl1271_remove(struct spi_device *spi)
{
struct wl1271 *wl = dev_get_drvdata(&spi->dev);
platform_device_unregister(&wl1271_device);
free_irq(wl->irq, wl);
wl1271_free_hw(wl);