Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'i2c-for-6.14-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
- add a missing Kconfig dependency for imx-lpi2c
- in the core, handle the new per-client debugfs directory during
probe/remove, not during {un}register
* tag 'i2c-for-6.14-rc1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: Fix core-managed per-client debugfs handling
i2c: imx-lpi2c: select CONFIG_I2C_SLAVE
+7
-3
+1
drivers/i2c/busses/Kconfig
+1
drivers/i2c/busses/Kconfig
+6
-3
drivers/i2c/i2c-core-base.c
+6
-3
drivers/i2c/i2c-core-base.c
···
583
583
goto err_detach_pm_domain;
584
584
}
585
585
586
+
client->debugfs = debugfs_create_dir(dev_name(&client->dev),
587
+
client->adapter->debugfs);
588
+
586
589
if (driver->probe)
587
590
status = driver->probe(client);
588
591
else
···
605
602
return 0;
606
603
607
604
err_release_driver_resources:
605
+
debugfs_remove_recursive(client->debugfs);
608
606
devres_release_group(&client->dev, client->devres_group_id);
609
607
err_detach_pm_domain:
610
608
dev_pm_domain_detach(&client->dev, do_power_on);
···
630
626
631
627
driver->remove(client);
632
628
}
629
+
630
+
debugfs_remove_recursive(client->debugfs);
633
631
634
632
devres_release_group(&client->dev, client->devres_group_id);
635
633
···
1021
1015
if (status)
1022
1016
goto out_remove_swnode;
1023
1017
1024
-
client->debugfs = debugfs_create_dir(dev_name(&client->dev), adap->debugfs);
1025
-
1026
1018
dev_dbg(&adap->dev, "client [%s] registered with bus id %s\n",
1027
1019
client->name, dev_name(&client->dev));
1028
1020
···
1065
1061
if (ACPI_COMPANION(&client->dev))
1066
1062
acpi_device_clear_enumerated(ACPI_COMPANION(&client->dev));
1067
1063
1068
-
debugfs_remove_recursive(client->debugfs);
1069
1064
device_remove_software_node(&client->dev);
1070
1065
device_unregister(&client->dev);
1071
1066
}