From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>, <linus.walleij@linaro.org>, <brgl@bgdev.pl>
Cc: <andy.shevchenko@gmail.com>, <bard.liao@intel.com>,
<linux-gpio@vger.kernel.org>, <linux-spi@vger.kernel.org>,
<patches@opensource.cirrus.com>
Subject: [PATCH v5 2/4] spi: Switch to using is_acpi_device_node() in spi_dev_set_name()
Date: Thu, 11 Apr 2024 10:06:26 +0100 [thread overview]
Message-ID: <20240411090628.2436389-3-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20240411090628.2436389-1-ckeepax@opensource.cirrus.com>
Use the more modern is_acpi_device_node() rather than checking
ACPI_COMPANION().
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
New since v4 of the series.
Thanks,
Charles
drivers/spi/spi.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index a2f01116ba09..05b33901eaa9 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -12,6 +12,7 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/export.h>
+#include <linux/fwnode.h>
#include <linux/gpio/consumer.h>
#include <linux/highmem.h>
#include <linux/idr.h>
@@ -597,10 +598,11 @@ EXPORT_SYMBOL_GPL(spi_alloc_device);
static void spi_dev_set_name(struct spi_device *spi)
{
- struct acpi_device *adev = ACPI_COMPANION(&spi->dev);
+ struct device *dev = &spi->dev;
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
- if (adev) {
- dev_set_name(&spi->dev, "spi-%s", acpi_dev_name(adev));
+ if (is_acpi_device_node(fwnode)) {
+ dev_set_name(dev, "spi-%s", acpi_dev_name(to_acpi_device_node(fwnode)));
return;
}
--
2.39.2
next prev parent reply other threads:[~2024-04-11 9:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 9:06 [PATCH 0/4] Add bridged amplifiers to cs42l43 Charles Keepax
2024-04-11 9:06 ` [PATCH v5 1/4] gpio: swnode: Add ability to specify native chip selects for SPI Charles Keepax
2024-04-11 13:25 ` Andy Shevchenko
2024-04-11 16:44 ` Charles Keepax
2024-04-11 16:50 ` Andy Shevchenko
2024-04-11 16:58 ` Charles Keepax
2024-04-11 9:06 ` Charles Keepax [this message]
2024-04-11 13:30 ` [PATCH v5 2/4] spi: Switch to using is_acpi_device_node() in spi_dev_set_name() Andy Shevchenko
2024-04-11 16:56 ` Charles Keepax
2024-04-11 18:09 ` Andy Shevchenko
2024-04-11 9:06 ` [PATCH v5 3/4] spi: Update swnode based SPI devices to use the fwnode name Charles Keepax
2024-04-11 13:33 ` Andy Shevchenko
2024-04-11 17:04 ` Charles Keepax
2024-04-11 18:07 ` Andy Shevchenko
2024-04-11 9:06 ` [PATCH v5 4/4] spi: cs42l43: Add bridged cs35l56 amplifiers Charles Keepax
2024-04-11 14:04 ` Andy Shevchenko
2024-04-11 14:06 ` Andy Shevchenko
2024-04-11 14:07 ` Andy Shevchenko
2024-04-11 17:13 ` Charles Keepax
2024-04-11 18:17 ` Andy Shevchenko
2024-04-15 13:39 ` Charles Keepax
2024-04-15 16:03 ` Andy Shevchenko
2024-04-11 11:46 ` [PATCH 0/4] Add bridged amplifiers to cs42l43 Andy Shevchenko
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=20240411090628.2436389-3-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=andy.shevchenko@gmail.com \
--cc=bard.liao@intel.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).