Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / spi / spi-pxa2xx-pci.c

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index cf95587eefde4c0aa87b0460b4d4ea6926a00de8..364964d2ed04f32a1436710a5019f7b7ccd3c261 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -8,147 +8,58 @@
 #include <linux/module.h>
 #include <linux/spi/pxa2xx_spi.h>
 
-struct ce4100_info {
-       struct ssp_device ssp;
-       struct platform_device *spi_pdev;
-};
-
-static DEFINE_MUTEX(ssp_lock);
-static LIST_HEAD(ssp_list);
-
-struct ssp_device *pxa_ssp_request(int port, const char *label)
-{
-       struct ssp_device *ssp = NULL;
-
-       mutex_lock(&ssp_lock);
-
-       list_for_each_entry(ssp, &ssp_list, node) {
-               if (ssp->port_id == port && ssp->use_count == 0) {
-                       ssp->use_count++;
-                       ssp->label = label;
-                       break;
-               }
-       }
-
-       mutex_unlock(&ssp_lock);
-
-       if (&ssp->node == &ssp_list)
-               return NULL;
-
-       return ssp;
-}
-EXPORT_SYMBOL_GPL(pxa_ssp_request);
-
-void pxa_ssp_free(struct ssp_device *ssp)
-{
-       mutex_lock(&ssp_lock);
-       if (ssp->use_count) {
-               ssp->use_count--;
-               ssp->label = NULL;
-       } else
-               dev_err(&ssp->pdev->dev, "device already free\n");
-       mutex_unlock(&ssp_lock);
-}
-EXPORT_SYMBOL_GPL(pxa_ssp_free);
-
 static int ce4100_spi_probe(struct pci_dev *dev,
                const struct pci_device_id *ent)
 {
+       struct platform_device_info pi;
        int ret;
-       resource_size_t phys_beg;
-       resource_size_t phys_len;
-       struct ce4100_info *spi_info;
        struct platform_device *pdev;
        struct pxa2xx_spi_master spi_pdata;
        struct ssp_device *ssp;
 
-       ret = pci_enable_device(dev);
+       ret = pcim_enable_device(dev);
        if (ret)
                return ret;
 
-       phys_beg = pci_resource_start(dev, 0);
-       phys_len = pci_resource_len(dev, 0);
-
-       if (!request_mem_region(phys_beg, phys_len,
-                               "CE4100 SPI")) {
-               dev_err(&dev->dev, "Can't request register space.\n");
-               ret = -EBUSY;
+       ret = pcim_iomap_regions(dev, 1 << 0, "PXA2xx SPI");
+       if (!ret)
                return ret;
-       }
 
-       pdev = platform_device_alloc("pxa2xx-spi", dev->devfn);
-       spi_info = kzalloc(sizeof(*spi_info), GFP_KERNEL);
-       if (!pdev || !spi_info ) {
-               ret = -ENOMEM;
-               goto err_nomem;
-       }
        memset(&spi_pdata, 0, sizeof(spi_pdata));
        spi_pdata.num_chipselect = dev->devfn;
 
-       ret = platform_device_add_data(pdev, &spi_pdata, sizeof(spi_pdata));
-       if (ret)
-               goto err_nomem;
-
-       pdev->dev.parent = &dev->dev;
-       pdev->dev.of_node = dev->dev.of_node;
-       ssp = &spi_info->ssp;
+       ssp = &spi_pdata.ssp;
        ssp->phys_base = pci_resource_start(dev, 0);
-       ssp->mmio_base = ioremap(phys_beg, phys_len);
+       ssp->mmio_base = pcim_iomap_table(dev)[0];
        if (!ssp->mmio_base) {
-               dev_err(&pdev->dev, "failed to ioremap() registers\n");
-               ret = -EIO;
-               goto err_nomem;
+               dev_err(&dev->dev, "failed to ioremap() registers\n");
+               return -EIO;
        }
        ssp->irq = dev->irq;
-       ssp->port_id = pdev->id;
+       ssp->port_id = dev->devfn;
        ssp->type = PXA25x_SSP;
 
-       mutex_lock(&ssp_lock);
-       list_add(&ssp->node, &ssp_list);
-       mutex_unlock(&ssp_lock);
+       memset(&pi, 0, sizeof(pi));
+       pi.parent = &dev->dev;
+       pi.name = "pxa2xx-spi";
+       pi.id = ssp->port_id;
+       pi.data = &spi_pdata;
+       pi.size_data = sizeof(spi_pdata);
 
-       pci_set_drvdata(dev, spi_info);
+       pdev = platform_device_register_full(&pi);
+       if (!pdev)
+               return -ENOMEM;
 
-       ret = platform_device_add(pdev);
-       if (ret)
-               goto err_dev_add;
+       pci_set_drvdata(dev, pdev);
 
-       return ret;
-
-err_dev_add:
-       pci_set_drvdata(dev, NULL);
-       mutex_lock(&ssp_lock);
-       list_del(&ssp->node);
-       mutex_unlock(&ssp_lock);
-       iounmap(ssp->mmio_base);
-
-err_nomem:
-       release_mem_region(phys_beg, phys_len);
-       platform_device_put(pdev);
-       kfree(spi_info);
-       return ret;
+       return 0;
 }
 
 static void ce4100_spi_remove(struct pci_dev *dev)
 {
-       struct ce4100_info *spi_info;
-       struct ssp_device *ssp;
-
-       spi_info = pci_get_drvdata(dev);
-       ssp = &spi_info->ssp;
-       platform_device_unregister(spi_info->spi_pdev);
-
-       iounmap(ssp->mmio_base);
-       release_mem_region(pci_resource_start(dev, 0),
-                       pci_resource_len(dev, 0));
-
-       mutex_lock(&ssp_lock);
-       list_del(&ssp->node);
-       mutex_unlock(&ssp_lock);
+       struct platform_device *pdev = pci_get_drvdata(dev);
 
-       pci_set_drvdata(dev, NULL);
-       pci_disable_device(dev);
-       kfree(spi_info);
+       platform_device_unregister(pdev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = {