spi/pxa2xx: embed the ssp_device to platform data

The spi-pxa2xx-pci glue driver had to implement pxa_ssp_request()/free() in
order to support the spi-pxa2xx platform driver. Since the ACPI enabled
platforms can use the same platform driver we would need to implement
pxa_ssp_request()/free() in some central place that can be shared by the
ACPI and PCI glue code.

Instead of doing that we can make pxa_ssp_request()/free() to be available
only when CONFIG_ARCH_PXA is set. On other arches these are being stubbed
out in preference to passing the ssp_device from the platform data
directly.

We also change the SPI bus number to be taken from ssp->port_id instead of
platform device id. This way the supporting code that passes the ssp can
decide the number (or it can set it to the same as pdev->id).

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 5 insertions, 68 deletions

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index ece979e9c642..364964d2ed04 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -8,55 +8,11 @@
 #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;
-        struct ce4100_info *spi_info;
         struct platform_device *pdev;
         struct pxa2xx_spi_master spi_pdata;
         struct ssp_device *ssp;
@@ -69,14 +25,10 @@ static int ce4100_spi_probe(struct pci_dev *dev,
         if (!ret)
                 return ret;
 
-        spi_info = devm_kzalloc(&dev->dev, sizeof(*spi_info), GFP_KERNEL);
-        if (!spi_info)
-                return -ENOMEM;
-
         memset(&spi_pdata, 0, sizeof(spi_pdata));
         spi_pdata.num_chipselect = dev->devfn;
 
-        ssp = &spi_info->ssp;
+        ssp = &spi_pdata.ssp;
         ssp->phys_base = pci_resource_start(dev, 0);
         ssp->mmio_base = pcim_iomap_table(dev)[0];
         if (!ssp->mmio_base) {
@@ -87,10 +39,6 @@ static int ce4100_spi_probe(struct pci_dev *dev,
         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";
@@ -99,30 +47,19 @@ static int ce4100_spi_probe(struct pci_dev *dev,
         pi.size_data = sizeof(spi_pdata);
 
         pdev = platform_device_register_full(&pi);
-        if (!pdev) {
-                mutex_lock(&ssp_lock);
-                list_del(&ssp->node);
-                mutex_unlock(&ssp_lock);
-
+        if (!pdev)
                 return -ENOMEM;
-        }
 
-        spi_info->spi_pdev = pdev;
-        pci_set_drvdata(dev, spi_info);
+        pci_set_drvdata(dev, pdev);
 
         return 0;
 }
 
 static void ce4100_spi_remove(struct pci_dev *dev)
 {
-        struct ce4100_info *spi_info = pci_get_drvdata(dev);
-        struct ssp_device *ssp = &spi_info->ssp;
-
-        platform_device_unregister(spi_info->spi_pdev);
+        struct platform_device *pdev = pci_get_drvdata(dev);
 
-        mutex_lock(&ssp_lock);
-        list_del(&ssp->node);
-        mutex_unlock(&ssp_lock);
+        platform_device_unregister(pdev);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = {