redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device

Browse source 
This is preparatory patch before converting to use device_get_match_data() API.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20191018105429.82782-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2019-10-18 13:54:27 +03:00 committed by Mark Brown
parent 5ce2570513
commit 365e856e18
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/spi/spi-pxa2xx.c
View file

@ -1476,11 +1476,13 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int pxa2xx_spi_get_port_id(struct acpi_device *adev) static int pxa2xx_spi_get_port_id(struct device *dev)
{ {
struct acpi_device *adev;
unsigned int devid; unsigned int devid;
int port_id = -1; int port_id = -1;
adev = ACPI_COMPANION(dev);
if (adev && adev->pnp.unique_id && if (adev && adev->pnp.unique_id &&
!kstrtouint(adev->pnp.unique_id, 0, &devid)) !kstrtouint(adev->pnp.unique_id, 0, &devid))
port_id = devid; port_id = devid;
@ -1489,7 +1491,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev)
#else /* !CONFIG_ACPI */ #else /* !CONFIG_ACPI */
static int pxa2xx_spi_get_port_id(struct acpi_device *adev) static int pxa2xx_spi_get_port_id(struct device *dev)
{ {
return -1; return -1;
} }
@ -1568,7 +1570,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
ssp->irq = platform_get_irq(pdev, 0); ssp->irq = platform_get_irq(pdev, 0);
ssp->type = type; ssp->type = type;
ssp->dev = &pdev->dev; ssp->dev = &pdev->dev;
ssp->port_id = pxa2xx_spi_get_port_id(adev); ssp->port_id = pxa2xx_spi_get_port_id(&pdev->dev);
pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave"); pdata->is_slave = of_property_read_bool(pdev->dev.of_node, "spi-slave");
pdata->num_chipselect = 1; pdata->num_chipselect = 1;