Merge commit 'v2.6.38-rc8' into spi/next
Grant Likely [Sat, 12 Mar 2011 08:25:53 +0000 (01:25 -0700)]
Conflicts:
drivers/spi/pxa2xx_spi_pci.c

1  2 
Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
drivers/gpio/pca953x.c
drivers/spi/pxa2xx_spi_pci.c
drivers/spi/spi_sh_msiof.c

Simple merge
@@@ -84,25 -75,24 +75,22 @@@ static int __devinit ce4100_spi_probe(s
                return ret;
        }
  
+       pdev = platform_device_alloc("pxa2xx-spi", dev->devfn);
        spi_info = kzalloc(sizeof(*spi_info), GFP_KERNEL);
-       if (!spi_info) {
+       if (!pdev || !spi_info ) {
                ret = -ENOMEM;
-               goto err_kz;
+               goto err_nomem;
        }
-       ssp = &spi_info->ssp;
-       pdev = &spi_info->spi_pdev;
-       spi_pdata =  &spi_info->spi_pdata;
+       memset(&spi_pdata, 0, sizeof(spi_pdata));
+       spi_pdata.num_chipselect = dev->devfn;
  
-       pdev->name = "pxa2xx-spi";
-       pdev->id = dev->devfn;
-       pdev->dev.parent = &dev->dev;
-       pdev->dev.platform_data = &spi_info->spi_pdata;
+       ret = platform_device_add_data(pdev, &spi_pdata, sizeof(spi_pdata));
+       if (ret)
+               goto err_nomem;
  
+       pdev->dev.parent = &dev->dev;
 -#ifdef CONFIG_OF
        pdev->dev.of_node = dev->dev.of_node;
-       pdev->dev.release = plat_dev_release;
-       spi_pdata->num_chipselect = dev->devfn;
 -#endif
+       ssp = &spi_info->ssp;
        ssp->phys_base = pci_resource_start(dev, 0);
        ssp->mmio_base = ioremap(phys_beg, phys_len);
        if (!ssp->mmio_base) {
Simple merge