On Mon, Nov 13, 2023 at 12:59 AM Wolfram Sang
<wsa+renesas@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> The I2C core now provides a per-adapter debugfs directory. Use it
> instead of creating a custom one.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-npcm7xx.c | 49 +++++---------------------------
> 1 file changed, 7 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
> index ae4bae63ad4f..54181b3f1919 100644
> --- a/drivers/i2c/busses/i2c-npcm7xx.c
> +++ b/drivers/i2c/busses/i2c-npcm7xx.c
> @@ -326,7 +326,6 @@ struct npcm_i2c {
> u8 slv_rd_buf[MAX_I2C_HW_FIFO_SIZE];
> u8 slv_wr_buf[MAX_I2C_HW_FIFO_SIZE];
> #endif
> - struct dentry *debugfs; /* debugfs device directory */
> u64 ber_cnt;
> u64 rec_succ_cnt;
> u64 rec_fail_cnt;
> @@ -2250,27 +2249,15 @@ static const struct i2c_algorithm npcm_i2c_algo = {
> #endif
> };
>
> -/* i2c debugfs directory: used to keep health monitor of i2c devices */
> -static struct dentry *npcm_i2c_debugfs_dir;
> -
> static void npcm_i2c_init_debugfs(struct platform_device *pdev,
> struct npcm_i2c *bus)
> {
> - struct dentry *d;
> -
> - if (!npcm_i2c_debugfs_dir)
> - return;
> - d = debugfs_create_dir(dev_name(&pdev->dev), npcm_i2c_debugfs_dir);
> - if (IS_ERR_OR_NULL(d))
> - return;
> - debugfs_create_u64("ber_cnt", 0444, d, &bus->ber_cnt);
> - debugfs_create_u64("nack_cnt", 0444, d, &bus->nack_cnt);
> - debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
> - debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
> - debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
> - debugfs_create_u64("tx_complete_cnt", 0444, d, &bus->tx_complete_cnt);
> -
> - bus->debugfs = d;
> + debugfs_create_u64("ber_cnt", 0444, bus->adap.debugfs, &bus->ber_cnt);
> + debugfs_create_u64("nack_cnt", 0444, bus->adap.debugfs, &bus->nack_cnt);
> + debugfs_create_u64("rec_succ_cnt", 0444, bus->adap.debugfs, &bus->rec_succ_cnt);
> + debugfs_create_u64("rec_fail_cnt", 0444, bus->adap.debugfs, &bus->rec_fail_cnt);
> + debugfs_create_u64("timeout_cnt", 0444, bus->adap.debugfs, &bus->timeout_cnt);
> + debugfs_create_u64("tx_complete_cnt", 0444, bus->adap.debugfs, &bus->tx_complete_cnt);
> }
>
> static int npcm_i2c_probe_bus(struct platform_device *pdev)
> @@ -2362,7 +2349,6 @@ static void npcm_i2c_remove_bus(struct platform_device *pdev)
> unsigned long lock_flags;
> struct npcm_i2c *bus = platform_get_drvdata(pdev);
>
> - debugfs_remove_recursive(bus->debugfs);
> spin_lock_irqsave(&bus->lock, lock_flags);
> npcm_i2c_disable(bus);
> spin_unlock_irqrestore(&bus->lock, lock_flags);
> @@ -2385,28 +2371,7 @@ static struct platform_driver npcm_i2c_bus_driver = {
> }
> };
>
> -static int __init npcm_i2c_init(void)
> -{
> - int ret;
> -
> - npcm_i2c_debugfs_dir = debugfs_create_dir("npcm_i2c", NULL);
> -
> - ret = platform_driver_register(&npcm_i2c_bus_driver);
> - if (ret) {
> - debugfs_remove_recursive(npcm_i2c_debugfs_dir);
> - return ret;
> - }
> -
> - return 0;
> -}
> -module_init(npcm_i2c_init);
> -
> -static void __exit npcm_i2c_exit(void)
> -{
> - platform_driver_unregister(&npcm_i2c_bus_driver);
> - debugfs_remove_recursive(npcm_i2c_debugfs_dir);
> -}
> -module_exit(npcm_i2c_exit);
> +module_platform_driver(npcm_i2c_bus_driver);
>
> MODULE_AUTHOR("Avi Fishman <avi.fishman@xxxxxxxxx>");
> MODULE_AUTHOR("Tali Perry <tali.perry@xxxxxxxxxxx>");
> --
> 2.35.1
>
Test pass on npcm8xx device.
Reviewed-by: Tali Perry <tali.perry1@xxxxxxxxx>
Thanks Wolfram for the patch!
