* [PATCH] platform/x86: i2c-multi-instantiate: Derive the device name from parent
@ 2019-09-20 10:02 Heikki Krogerus
2019-09-20 10:32 ` Hans de Goede
0 siblings, 1 reply; 2+ messages in thread
From: Heikki Krogerus @ 2019-09-20 10:02 UTC (permalink / raw)
To: Hans de Goede, Andy Shevchenko
Cc: Darren Hart, platform-driver-x86, linux-kernel, stable
When naming the new devices, instead of using the ACPI ID in
the name as base, using the parent device's name. That makes
it possible to support multiple multi-instance i2c devices
of the same type in the same system.
This fixes an issue seen on some Intel Kaby Lake based
boards:
sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-INT3515-tps6598x.0'
Fixes: 2336dfadfb1e ("platform/x86: i2c-multi-instantiate: Allow to have same slaves")
Cc: stable@vger.kernel.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/platform/x86/i2c-multi-instantiate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
index 61fe341a85aa..ea68f6ed66ae 100644
--- a/drivers/platform/x86/i2c-multi-instantiate.c
+++ b/drivers/platform/x86/i2c-multi-instantiate.c
@@ -90,7 +90,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
for (i = 0; i < multi->num_clients && inst_data[i].type; i++) {
memset(&board_info, 0, sizeof(board_info));
strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE);
- snprintf(name, sizeof(name), "%s-%s.%d", match->id,
+ snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev),
inst_data[i].type, i);
board_info.dev_name = name;
switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) {
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] platform/x86: i2c-multi-instantiate: Derive the device name from parent
2019-09-20 10:02 [PATCH] platform/x86: i2c-multi-instantiate: Derive the device name from parent Heikki Krogerus
@ 2019-09-20 10:32 ` Hans de Goede
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Goede @ 2019-09-20 10:32 UTC (permalink / raw)
To: Heikki Krogerus, Andy Shevchenko
Cc: Darren Hart, platform-driver-x86, linux-kernel, stable
Hi,
On 9/20/19 12:02 PM, Heikki Krogerus wrote:
> When naming the new devices, instead of using the ACPI ID in
> the name as base, using the parent device's name. That makes
> it possible to support multiple multi-instance i2c devices
> of the same type in the same system.
>
> This fixes an issue seen on some Intel Kaby Lake based
> boards:
>
> sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-INT3515-tps6598x.0'
>
> Fixes: 2336dfadfb1e ("platform/x86: i2c-multi-instantiate: Allow to have same slaves")
> Cc: stable@vger.kernel.org
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/platform/x86/i2c-multi-instantiate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c
> index 61fe341a85aa..ea68f6ed66ae 100644
> --- a/drivers/platform/x86/i2c-multi-instantiate.c
> +++ b/drivers/platform/x86/i2c-multi-instantiate.c
> @@ -90,7 +90,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev)
> for (i = 0; i < multi->num_clients && inst_data[i].type; i++) {
> memset(&board_info, 0, sizeof(board_info));
> strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE);
> - snprintf(name, sizeof(name), "%s-%s.%d", match->id,
> + snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev),
> inst_data[i].type, i);
> board_info.dev_name = name;
> switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-20 10:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-20 10:02 [PATCH] platform/x86: i2c-multi-instantiate: Derive the device name from parent Heikki Krogerus
2019-09-20 10:32 ` Hans de Goede
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.