From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Mark Gross <markgross@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 1/6] platform/x86: serial-multi-instantiate: Improve autodetection
Date: Sun, 10 Jul 2022 00:16:48 +0300 [thread overview]
Message-ID: <20220709211653.18938-1-andriy.shevchenko@linux.intel.com> (raw)
Instead of calling specific resource counter, let just probe each
of the type and see what it says. Return -ENOENT if no resources
found.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: squashed patch 1, restored behaviour, added comment, dropped message (Hans)
.../platform/x86/serial-multi-instantiate.c | 23 ++++++++++++-------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index 1e8063b7c169..366087a9fce2 100644
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -100,7 +100,7 @@ static int smi_spi_probe(struct platform_device *pdev, struct acpi_device *adev,
if (ret < 0)
return ret;
else if (!ret)
- return -ENODEV;
+ return -ENOENT;
count = ret;
@@ -184,7 +184,7 @@ static int smi_i2c_probe(struct platform_device *pdev, struct acpi_device *adev,
if (ret < 0)
return ret;
else if (!ret)
- return -ENODEV;
+ return -ENOENT;
count = ret;
@@ -232,6 +232,7 @@ static int smi_probe(struct platform_device *pdev)
const struct smi_node *node;
struct acpi_device *adev;
struct smi *smi;
+ int ret;
adev = ACPI_COMPANION(dev);
if (!adev)
@@ -255,15 +256,21 @@ static int smi_probe(struct platform_device *pdev)
case SMI_SPI:
return smi_spi_probe(pdev, adev, smi, node->instances);
case SMI_AUTO_DETECT:
- if (i2c_acpi_client_count(adev) > 0)
- return smi_i2c_probe(pdev, adev, smi, node->instances);
- else
- return smi_spi_probe(pdev, adev, smi, node->instances);
+ /*
+ * For backwards-compatibility with the existing nodes I2C
+ * is checked first and if such entries are found ONLY I2C
+ * devices are created. Since some existing nodes that were
+ * already handled by this driver could also contain unrelated
+ * SpiSerialBus nodes that were previously ignored, and this
+ * preserves that behavior.
+ */
+ ret = smi_i2c_probe(pdev, adev, smi, node->instances);
+ if (ret != -ENOENT)
+ return ret;
+ return smi_spi_probe(pdev, adev, smi, node->instances);
default:
return -EINVAL;
}
-
- return 0; /* never reached */
}
static int smi_remove(struct platform_device *pdev)
--
2.35.1
next reply other threads:[~2022-07-09 21:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-09 21:16 Andy Shevchenko [this message]
2022-07-09 21:16 ` [PATCH v2 2/6] platform/x86: serial-multi-instantiate: Drop duplicate check Andy Shevchenko
2022-07-09 21:16 ` [PATCH v2 3/6] platform/x86: serial-multi-instantiate: Improve dev_err_probe() messaging Andy Shevchenko
2022-07-09 21:16 ` [PATCH v2 4/6] platform/x86: serial-multi-instantiate: Use while (i--) pattern to clean up Andy Shevchenko
2022-07-09 21:16 ` [PATCH v2 5/6] platform/x86: serial-multi-instantiate: Get rid of redundant 'else' Andy Shevchenko
2022-07-09 21:16 ` [PATCH v2 6/6] platform/x86: serial-multi-instantiate: Sort ACPI IDs by HID Andy Shevchenko
2022-07-10 16:14 ` [PATCH v2 1/6] platform/x86: serial-multi-instantiate: Improve autodetection Hans de Goede
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=20220709211653.18938-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/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).