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 <[email protected]>
---
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
In the snippets like the following
if (...)
return / goto / break / continue ...;
else
...
the 'else' is redundant. Get rid of it.
Signed-off-by: Andy Shevchenko <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
---
v2: added tag (Hans)
drivers/platform/x86/serial-multi-instantiate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index 0a2335693f4f..24f915bbdec1 100644
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -98,7 +98,7 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi,
ret = acpi_spi_count_resources(adev);
if (ret < 0)
return ret;
- else if (!ret)
+ if (!ret)
return -ENOENT;
count = ret;
@@ -180,7 +180,7 @@ static int smi_i2c_probe(struct platform_device *pdev, struct smi *smi,
ret = i2c_acpi_client_count(adev);
if (ret < 0)
return ret;
- else if (!ret)
+ if (!ret)
return -ENOENT;
count = ret;
--
2.35.1
It's easier to maintain the sorted table.
Keep the sorting order in sync with one in drivers/acpi/scan.c.
Signed-off-by: Andy Shevchenko <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
---
v2: added tag (Hans)
drivers/platform/x86/serial-multi-instantiate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index 24f915bbdec1..67feed25c9db 100644
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -324,8 +324,8 @@ static const struct smi_node cs35l41_hda = {
static const struct acpi_device_id smi_acpi_ids[] = {
{ "BSG1160", (unsigned long)&bsg1160_data },
{ "BSG2150", (unsigned long)&bsg2150_data },
- { "INT3515", (unsigned long)&int3515_data },
{ "CSC3551", (unsigned long)&cs35l41_hda },
+ { "INT3515", (unsigned long)&int3515_data },
/* Non-conforming _HID for Cirrus Logic already released */
{ "CLSA0100", (unsigned long)&cs35l41_hda },
{ }
--
2.35.1
Hi,
On 7/9/22 23:16, Andy Shevchenko wrote:
> 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 <[email protected]>
Thank you for your patch-series, I've applied the series to my
review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
> ---
> 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)