lkml.org 
[lkml]   [2022]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 2/7] platform/x86: serial-multi-instantiate: Improve autodetection
Date
Instead of calling specific resource counter, let just probe each
of the type and see what it says. Also add a debug message when
none is found.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/serial-multi-instantiate.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index 97db23243018..e599058196bb 100644
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -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,20 @@ 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);
+ ret = smi_i2c_probe(pdev, adev, smi, node->instances);
+ if (ret && ret != -ENOENT)
+ return ret;
+ ret = smi_spi_probe(pdev, adev, smi, node->instances);
+ if (ret && ret != -ENOENT)
+ return ret;
+ if (ret)
+ return dev_err_probe(dev, ret, "Error No resources found\n");
+ break;
default:
return -EINVAL;
}

- return 0; /* never reached */
+ return 0;
}

static int smi_remove(struct platform_device *pdev)
--
2.35.1
\
 
 \ /
  Last update: 2022-07-09 02:08    [W:0.084 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site