Commit a46b51cd authored Apr 16, 2019 by Jon Hunter Committed by Thierry Reding Apr 17, 2019

soc/tegra: pmc: Remove reset sysfs entries on error

Commit 5f84bb1a ("soc/tegra: pmc: Add sysfs entries for reset info")
added sysfs entries for Tegra reset source and level. However, these
sysfs are not removed on error and so if the registering of PMC device
is probe deferred, then the next time we attempt to probe the PMC device
warnings such as the following will be displayed on boot ...

sysfs: cannot create duplicate filename '/devices/platform/7000e400.pmc/reset_reason'

Fix this by calling device_remove_file() for each sysfs entry added on
failure. Note that we call device_remove_file() unconditionally without
checking if the sysfs entry was created in the first place, but this
should be OK because kernfs_remove_by_name_ns() will fail silently.

Fixes: 5f84bb1a ("soc/tegra: pmc: Add sysfs entries for reset info")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

parent 00cdaa1b

drivers/soc/tegra/pmc.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2040,7 +2040,7 @@ static int tegra_pmc_probe(struct platform_device *pdev)
		if (IS_ENABLED(CONFIG_DEBUG_FS)) {
		err = tegra_powergate_debugfs_init();
		if (err < 0)
		return err;
		goto cleanup_sysfs;
		}

		err = register_restart_handler(&tegra_pmc_restart_handler);
		@@ -2071,6 +2071,9 @@ cleanup_restart_handler:
		unregister_restart_handler(&tegra_pmc_restart_handler);
		cleanup_debugfs:
		debugfs_remove(pmc->debugfs);
		cleanup_sysfs:
		device_remove_file(&pdev->dev, &dev_attr_reset_reason);
		device_remove_file(&pdev->dev, &dev_attr_reset_level);
		return err;
		}

Admin message