linux-next: manual merge of the wireless-next tree with the net-next tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless-next tree got conflicts in
drivers/net/wireless/ti/wlcore/sdio.c and
drivers/net/wireless/ti/wlcore/spi.c between commit 0d2e7a5c6080
("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from
the net-next tree and commit afb43e6d88e5 ("wlcore: remove if_ops from
platform_data") from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au
diff --cc drivers/net/wireless/ti/wlcore/sdio.c
index 75622f6,198028d..0000000
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@@ -228,9 -228,19 +228,17 @@@ static int wl1271_probe(struct sdio_fun
        if (func->num != 0x02)
                return -ENODEV;
  
+       pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
+       if (!pdev_data) {
+               dev_err(&func->dev, "can't allocate platdev_data\n");
+               goto out;
+       }
+ 
+       pdev_data->if_ops = &sdio_ops;
+ 
        glue = kzalloc(sizeof(*glue), GFP_KERNEL);
 -      if (!glue) {
 -              dev_err(&func->dev, "can't allocate glue\n");
 +      if (!glue)
-               goto out;
+               goto out_free_pdev_data;
 -      }
  
        glue->dev = &func->dev;
  
diff --cc drivers/net/wireless/ti/wlcore/spi.c
index 53790d1,5ad2e10..0000000
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@@ -325,17 -331,26 +325,24 @@@ static int wl1271_probe(struct spi_devi
        struct resource res[1];
        int ret = -ENOMEM;
  
-       pdata = spi->dev.platform_data;
-       if (!pdata) {
+       pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
+       if (!pdev_data) {
+               dev_err(&spi->dev, "can't allocate platdev_data\n");
+               goto out;
+       }
+ 
+       pdev_data->pdata = spi->dev.platform_data;
+       if (!pdev_data->pdata) {
                dev_err(&spi->dev, "no platform data\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_free_pdev_data;
        }
  
-       pdata->ops = &spi_ops;
+       pdev_data->if_ops = &spi_ops;
  
        glue = kzalloc(sizeof(*glue), GFP_KERNEL);
 -      if (!glue) {
 -              dev_err(&spi->dev, "can't allocate glue\n");
 +      if (!glue)
-               goto out;
+               goto out_free_pdev_data;
 -      }
  
        glue->dev = &spi->dev;
  

pgpjXLg7E8IyT.pgp
Description: PGP signature