i2c/pdx86: Add an i2c_acpi_client_count() helper function
Subsystems (5)
cover i2c/pdx86: Add an i2c_acpi_client_count() helper function
Hi All,
This patch-set adds a new i2c_acpi_client_count() helper function to remove a bunch of code-duplication.
Since 3 of the 4 patches touch files under drivers/platform/x86 and also since the drivers/platform/x86/dual_accel_detect.h file is new in pdx86/for-next I believe that it would be best to just merge the entire series through my pdx86 tree.
Mika + WSA, may I have your ack for merging the entire series through the pdx86 tree (or please let me know if you want to proceed in a different way) ?
Regards,
Hans
Hans de Goede (4):
i2c: acpi: Add an i2c_acpi_client_count() helper function platform/x86: dual_accel_detect: Use the new i2c_acpi_client_count()
helper
platform/x86: i2c-multi-instantiate: Use the new
i2c_acpi_client_count() helper
platform/x86: intel_cht_int33fe: Use the new i2c_acpi_client_count()
helper
drivers/i2c/i2c-core-acpi.c | 32 +++++++++++++++++++ drivers/platform/x86/dual_accel_detect.h | 26 +-------------- drivers/platform/x86/i2c-multi-instantiate.c | 27 +--------------- .../intel/int33fe/intel_cht_int33fe_common.c | 29 +---------------- include/linux/i2c.h | 5 +++ 5 files changed, 40 insertions(+), 79 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/4 i2c: acpi: Add an i2c_acpi_client_count() helper function
We have 3 files now which have the need to count the number of I2cSerialBus resources in an ACPI-device's resource-list.
Currently all implement their own helper function for this, add a generic helper function to replace the 3 implementations.
--- drivers/i2c/i2c-core-acpi.c | 32 ++++++++++++++++++++++++++++++++ include/linux/i2c.h | 5 +++++ 2 files changed, 37 insertions(+)
drivers/i2c/i2c-core-acpi.c +32 -0
@@ -69,6 +69,38 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, }EXPORT_SYMBOL_GPL (i2c_acpi_get_i2c_resource); +static int i2c_acpi_resource_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 ; +} + +/** +* i2c_acpi_client_count - Count the number of I2cSerialBus resources +* @adev: ACPI device +* +* Returns the number of I2cSerialBus resources in the ACPI-device's +* resource-list; or a negative error code. +*/ +int i2c_acpi_client_count (struct acpi_device *adev) +{ +int ret, count =0 ; +LIST_HEAD (r); + + ret =acpi_dev_get_resources (adev, &r, i2c_acpi_resource_count, &count); +if (ret <0 ) +return ret; + +acpi_dev_free_resource_list (&r); +return count; +} +EXPORT_SYMBOL_GPL (i2c_acpi_client_count); +static int i2c_acpi_fill_info (struct acpi_resource *ares,void *data) {struct i2c_acpi_lookup *lookup = data;
include/linux/i2c.h +5 -0
@@ -1010,6 +1010,7 @@ struct acpi_resource_i2c_serialbus;#if IS_ENABLED (CONFIG_ACPI )bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c); +int i2c_acpi_client_count (struct acpi_device *adev);u32 i2c_acpi_find_bus_speed (struct device *dev);struct i2c_client *i2c_acpi_new_device (struct device *dev,int index,struct i2c_board_info *info);
@@ -1020,6 +1021,10 @@ static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, {return false; } +static inline int i2c_acpi_client_count (struct acpi_device *adev) +{ +return 0 ; +}static inline u32 i2c_acpi_find_bus_speed (struct device *dev) {return 0 ;
Signature · 1 line
2.31.1
Re: [PATCH 1/4] i2c: acpi: Add an i2c_acpi_client_count() helper function
Quoted 7 lines · Hans de Goede
We have 3 files now which have the need to count the number of I2cSerialBus resources in an ACPI-device's resource-list.
Currently all implement their own helper function for this, add a generic helper function to replace the 3 implementations.
Signed-off-by Hans de Goede <[email protected]>
Re: [PATCH 1/4] i2c: acpi: Add an i2c_acpi_client_count() helper function
Hi,
Quoted 10 lines · Mika Westerberg
Quoted 7 lines · Hans de Goede
We have 3 files now which have the need to count the number of I2cSerialBus resources in an ACPI-device's resource-list.
Currently all implement their own helper function for this, add a generic helper function to replace the 3 implementations.
Signed-off-by Hans de Goede <[email protected]>Acked-by Mika Westerberg <[email protected]>
Thank you, Wolfram are you also ok with me merging this patch through the pdx86 tree?
Regards,
Hans
Wolfram Sang
Acked-byRe: [PATCH 1/4] i2c: acpi: Add an i2c_acpi_client_count() helper function
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
We have 3 files now which have the need to count the number of I2cSerialBus resources in an ACPI-device's resource-list.
Currently all implement their own helper function for this, add a generic helper function to replace the 3 implementations.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Hans de Goede <[email protected]>Acked-by Mika Westerberg <[email protected]>Thank you, Wolfram are you also ok with me merging this patch through the pdx86 tree?
Sure!
Re: [PATCH 1/4] i2c: acpi: Add an i2c_acpi_client_count() helper function
Hi,
Quoted 9 lines · Wolfram Sang
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
We have 3 files now which have the need to count the number of I2cSerialBus resources in an ACPI-device's resource-list.
Currently all implement their own helper function for this, add a generic helper function to replace the 3 implementations.
Signed-off-by Hans de Goede <[email protected]>
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Acked-by Mika Westerberg <[email protected]>Thank you, Wolfram are you also ok with me merging this patch through the pdx86 tree?
Sure!
Acked-by Wolfram Sang <[email protected]>
Thank you. I've added this series to my review-hans branch now.
I'll push it out to pdx86/for-next after some (build) testing.
Regards,
Hans
PATCH 2/4 platform/x86: dual_accel_detect: Use the new i2c_acpi_client_count() helper
In reply to Hans de GoedeUse the new i2c_acpi_client_count() helper, this
results in a nice cleanup.
--- drivers/platform/x86/dual_accel_detect.h | 26 +----------------------- 1 file changed, 1 insertion(+), 25 deletions(-)
drivers/platform/x86/dual_accel_detect.h +1 -25
@@ -17,30 +17,6 @@#include <linux/acpi.h> #include <linux/i2c.h> -static int dual_accel_i2c_resource_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 dual_accel_i2c_client_count (struct acpi_device *adev) -{ -int ret, count =0 ; -LIST_HEAD (r); - - ret =acpi_dev_get_resources (adev, &r, dual_accel_i2c_resource_count, &count); -if (ret <0 ) -return ret; - -acpi_dev_free_resource_list (&r); -return count; -} -static bool dual_accel_detect_bosc0200 (void ) {struct acpi_device *adev;
@@ -50,7 +26,7 @@ static bool dual_accel_detect_bosc0200(void)if (!adev)return false; - count =dual_accel_i2c_client_count (adev); + count =i2c_acpi_client_count (adev);acpi_dev_put (adev);
Signature · 1 line
2.31.1
PATCH 3/4 platform/x86: i2c-multi-instantiate: Use the new i2c_acpi_client_count() helper
In reply to Hans de GoedeUse the new i2c_acpi_client_count() helper, this
results in a nice cleanup.
--- drivers/platform/x86/i2c-multi-instantiate.c | 27 +------------------- 1 file changed, 1 insertion(+), 26 deletions(-)
drivers/platform/x86/i2c-multi-instantiate.c +1 -26
@@ -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;
Signature · 1 line
2.31.1
PATCH 4/4 platform/x86: intel_cht_int33fe: Use the new i2c_acpi_client_count() helper
In reply to Hans de GoedeUse the new i2c_acpi_client_count() helper, this
results in a nice cleanup.
--- .../intel/int33fe/intel_cht_int33fe_common.c | 29 +------------------ 1 file changed, 1 insertion(+), 28 deletions(-)
drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c +1 -28
@@ -16,33 +16,6 @@#define EXPECTED_PTYPE 4 -static int cht_int33fe_i2c_res_filter (struct acpi_resource *ares,void *data) -{ -struct acpi_resource_i2c_serialbus *sb; -int *count = data; - -if (i2c_acpi_get_i2c_resource (ares, &sb)) - (*count)++; - -return 1 ; -} - -static int cht_int33fe_count_i2c_clients (struct device *dev) -{ -struct acpi_device *adev =ACPI_COMPANION (dev); -LIST_HEAD (resource_list); -int count =0 ; -int ret; - - ret =acpi_dev_get_resources (adev, &resource_list, - cht_int33fe_i2c_res_filter, &count); -acpi_dev_free_resource_list (&resource_list); -if (ret <0 ) -return ret; - -return count; -} -static int cht_int33fe_check_hw_type (struct device *dev) {unsigned long long ptyp;
@@ -69,7 +42,7 @@ static int cht_int33fe_check_hw_type(struct device *dev)return -ENODEV ; } - ret =cht_int33fe_count_i2c_clients (dev); + ret =i2c_acpi_client_count (ACPI_COMPANION (dev));if (ret <0 )return ret;
Signature · 1 line
2.31.1
Quoted 10 lines · Hans de Goede
Hi All,
This patch-set adds a new
i2c_acpi_client_count()helper function to remove a bunch of code-duplication.Since 3 of the 4 patches touch files under
drivers/platform/x86and also since thedrivers/platform/x86/dual_accel_detect.hfile is new in pdx86/for-next I believe that it would be best to just merge the entire series through my pdx86 tree.
Utterly in favour of this series
Thanks for doing this!
Quoted 28 lines
Mika + WSA, may I have your ack for merging the entire series through the pdx86 tree (or please let me know if you want to proceed in a different way) ?
Regards,
Hans
Hans de Goede (4):
i2c: acpi: Add ani2c_acpi_client_count()helper function platform/x86:dual_accel_detect: Use the newi2c_acpi_client_count()
helper
platform/x86: i2c-multi-instantiate: Use the new
i2c_acpi_client_count()helper
platform/x86:intel_cht_int33fe: Use the newi2c_acpi_client_count()
helperdrivers/i2c/i2c-core-acpi.c | 32 +++++++++++++++++++ drivers/platform/x86/dual_accel_detect.h | 26 +-------------- drivers/platform/x86/i2c-multi-instantiate.c | 27 +--------------- .../intel/int33fe/intel_cht_int33fe_common.c | 29 +---------------- include/linux/i2c.h | 5 +++ 5 files changed, 40 insertions(+), 79 deletions(-)--
2.31.1
Signature · 2 lines
With Best Regards, Andy Shevchenko