From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
linux-arm-kernel@lists.infradead.org,
Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 3/5] spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device
Date: Fri, 18 Oct 2019 13:54:27 +0300 [thread overview]
Message-ID: <20191018105429.82782-3-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20191018105429.82782-1-andriy.shevchenko@linux.intel.com>
This is preparatory patch before converting to use device_get_match_data() API.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi-pxa2xx.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 670734b3d56a..04ca80770e35 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1476,11 +1476,13 @@ MODULE_DEVICE_TABLE(of, pxa2xx_spi_of_match);
#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;
int port_id = -1;
+ adev = ACPI_COMPANION(dev);
if (adev && adev->pnp.unique_id &&
!kstrtouint(adev->pnp.unique_id, 0, &devid))
port_id = devid;
@@ -1489,7 +1491,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev)
#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;
}
@@ -1568,7 +1570,7 @@ pxa2xx_spi_init_pdata(struct platform_device *pdev)
ssp->irq = platform_get_irq(pdev, 0);
ssp->type = type;
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->num_chipselect = 1;
--
2.23.0
next prev parent reply other threads:[~2019-10-18 10:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 10:54 [PATCH v1 1/5] spi: pxa2xx: No need to keep pointer to platform device Andy Shevchenko
2019-10-18 10:54 ` [PATCH v1 2/5] spi: pxa2xx: Sort headers Andy Shevchenko
2019-10-18 18:07 ` Applied "spi: pxa2xx: Sort headers" to the spi tree Mark Brown
2019-10-18 10:54 ` Andy Shevchenko [this message]
2019-10-18 18:07 ` Applied "spi: pxa2xx: Convert pxa2xx_spi_get_port_id() to take struct device" " Mark Brown
2019-10-18 10:54 ` [PATCH v1 4/5] spi: pxa2xx: Convert to use device_get_match_data() Andy Shevchenko
2019-10-18 18:07 ` Applied "spi: pxa2xx: Convert to use device_get_match_data()" to the spi tree Mark Brown
2019-10-18 10:54 ` [PATCH v1 5/5] spi: pxa2xx: Replace of_device.h with mod_devicetable.h and of.h Andy Shevchenko
2019-10-18 18:07 ` Applied "spi: pxa2xx: Replace of_device.h with mod_devicetable.h and of.h" to the spi tree Mark Brown
2019-10-18 18:07 ` Applied "spi: pxa2xx: No need to keep pointer to platform device" " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018105429.82782-3-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).