|
@@ -217,7 +217,6 @@ static struct wl1271_if_operations sdio_ops = {
|
|
|
static int wl1271_probe(struct sdio_func *func,
|
|
|
const struct sdio_device_id *id)
|
|
|
{
|
|
|
- struct wl12xx_platform_data *wlan_data;
|
|
|
struct wlcore_platdev_data *pdev_data;
|
|
|
struct wl12xx_sdio_glue *glue;
|
|
|
struct resource res[1];
|
|
@@ -251,9 +250,9 @@ static int wl1271_probe(struct sdio_func *func,
|
|
|
/* Use block mode for transferring over one block size of data */
|
|
|
func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
|
|
|
|
|
|
- wlan_data = wl12xx_get_platform_data();
|
|
|
- if (IS_ERR(wlan_data)) {
|
|
|
- ret = PTR_ERR(wlan_data);
|
|
|
+ pdev_data->pdata = wl12xx_get_platform_data();
|
|
|
+ if (IS_ERR(pdev_data->pdata)) {
|
|
|
+ ret = PTR_ERR(pdev_data->pdata);
|
|
|
dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
|
|
|
goto out_free_glue;
|
|
|
}
|
|
@@ -263,7 +262,7 @@ static int wl1271_probe(struct sdio_func *func,
|
|
|
dev_dbg(glue->dev, "sdio PM caps = 0x%x\n", mmcflags);
|
|
|
|
|
|
if (mmcflags & MMC_PM_KEEP_POWER)
|
|
|
- wlan_data->pwr_in_suspend = true;
|
|
|
+ pdev_data->pdata->pwr_in_suspend = true;
|
|
|
|
|
|
sdio_set_drvdata(func, glue);
|
|
|
|
|
@@ -292,7 +291,7 @@ static int wl1271_probe(struct sdio_func *func,
|
|
|
|
|
|
memset(res, 0x00, sizeof(res));
|
|
|
|
|
|
- res[0].start = wlan_data->irq;
|
|
|
+ res[0].start = pdev_data->pdata->irq;
|
|
|
res[0].flags = IORESOURCE_IRQ;
|
|
|
res[0].name = "irq";
|
|
|
|
|
@@ -302,8 +301,6 @@ static int wl1271_probe(struct sdio_func *func,
|
|
|
goto out_dev_put;
|
|
|
}
|
|
|
|
|
|
- pdev_data->pdata = wlan_data;
|
|
|
-
|
|
|
ret = platform_device_add_data(glue->core, pdev_data,
|
|
|
sizeof(*pdev_data));
|
|
|
if (ret) {
|