diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2021-08-03 18:00:43 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-08-12 17:26:36 +0200 |
| commit | 5791c2648dc468c00de405b2af32c5189d5cb345 (patch) | |
| tree | b0efee2d0dd7f74dbeeac0ad0fa5e47f5c4af7f8 /drivers/platform/x86/i2c-multi-instantiate.c | |
| parent | f13d483eafdf60fc809e555e0329ee6257582612 (diff) | |
| download | linux-stable-5791c2648dc468c00de405b2af32c5189d5cb345.tar.gz linux-stable-5791c2648dc468c00de405b2af32c5189d5cb345.tar.bz2 linux-stable-5791c2648dc468c00de405b2af32c5189d5cb345.zip | |
platform/x86: i2c-multi-instantiate: Use the new i2c_acpi_client_count() helper
Use the new i2c_acpi_client_count() helper, this
results in a nice cleanup.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210803160044.158802-4-hdegoede@redhat.com
Diffstat (limited to 'drivers/platform/x86/i2c-multi-instantiate.c')
| -rw-r--r-- | drivers/platform/x86/i2c-multi-instantiate.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c index 2cce82579d09..a50153ecd560 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/i2c-multi-instantiate.c @@ -32,31 +32,6 @@ struct i2c_multi_inst_data { struct i2c_client *clients[]; }; -static int i2c_multi_inst_count(struct acpi_resource *ares, void *data) -{ - struct acpi_resource_i2c_serialbus *sb; - int *count = data; - - if (i2c_acpi_get_i2c_resource(ares, &sb)) - *count = *count + 1; - - return 1; -} - -static int i2c_multi_inst_count_resources(struct acpi_device *adev) -{ - LIST_HEAD(r); - int count = 0; - int ret; - - ret = acpi_dev_get_resources(adev, &r, i2c_multi_inst_count, &count); - if (ret < 0) - return ret; - - acpi_dev_free_resource_list(&r); - return count; -} - static int i2c_multi_inst_probe(struct platform_device *pdev) { struct i2c_multi_inst_data *multi; @@ -76,7 +51,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) adev = ACPI_COMPANION(dev); /* Count number of clients to instantiate */ - ret = i2c_multi_inst_count_resources(adev); + ret = i2c_acpi_client_count(adev); if (ret < 0) return ret; |