summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-10-10 13:09:28 -0400
committerMark Brown <broonie@kernel.org>2018-10-11 10:28:03 -0400
commit55ef8262f2b1b31762b045b14182db3cc8f607d1 (patch)
treed4ae25dfe12b81f23f0a9fbb1e2d0bde03d23869
parent561de45f72bd5f9b3f166bdd6151d4d0fe9e6534 (diff)
spi: pxa2xx: Use an enum for type
That seems to be the correct type. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-pxa2xx.c6
-rw-r--r--include/linux/pxa2xx_ssp.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index d68f511a9ef1..8baa5b038f15 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1431,7 +1431,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
1431 struct resource *res; 1431 struct resource *res;
1432 const struct acpi_device_id *adev_id = NULL; 1432 const struct acpi_device_id *adev_id = NULL;
1433 const struct pci_device_id *pcidev_id = NULL; 1433 const struct pci_device_id *pcidev_id = NULL;
1434 int type; 1434 enum pxa_ssp_type type;
1435 1435
1436 adev = ACPI_COMPANION(&pdev->dev); 1436 adev = ACPI_COMPANION(&pdev->dev);
1437 1437
@@ -1445,9 +1445,9 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
1445 return NULL; 1445 return NULL;
1446 1446
1447 if (adev_id) 1447 if (adev_id)
1448 type = (int)adev_id->driver_data; 1448 type = (enum pxa_ssp_type)adev_id->driver_data;
1449 else if (pcidev_id) 1449 else if (pcidev_id)
1450 type = (int)pcidev_id->driver_data; 1450 type = (enum pxa_ssp_type)pcidev_id->driver_data;
1451 else 1451 else
1452 return NULL; 1452 return NULL;
1453 1453
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index 13b4244d44c1..262e1f318836 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -217,7 +217,7 @@ struct ssp_device {
217 217
218 const char *label; 218 const char *label;
219 int port_id; 219 int port_id;
220 int type; 220 enum pxa_ssp_type type;
221 int use_count; 221 int use_count;
222 int irq; 222 int irq;
223 223