diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-06-18 15:55:13 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2021-06-22 11:15:06 +0200 |
| commit | 7b2baa407c3c9e6f74c7edfa181eeb001e75ed3e (patch) | |
| tree | 0a89880bb5443f2c1c9c66fc228c6f0f2f9d98e1 /drivers/platform | |
| parent | 719941878bc95af5e1368eca56fd4dcbd3633f10 (diff) | |
platform/x86: intel_skl_int3472: Provide skl_int3472_unregister_regulator()
For the sake of APIs to be properly layered provide
skl_int3472_unregister_regulator().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Daniel Scally <djrscally@gmail.com>
Tested-by: Daniel Scally <djrscally@gmail.com>
Link: https://lore.kernel.org/r/20210618125516.53510-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'drivers/platform')
3 files changed, 10 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c b/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c index 49ea1e86c193..60c7128f44ee 100644 --- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c +++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c @@ -193,3 +193,9 @@ err_free_gpio: return ret; } + +void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472) +{ + regulator_unregister(int3472->regulator.rdev); + gpiod_put(int3472->regulator.gpio); +} diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h b/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h index 765e01ec1604..50f73c6eab44 100644 --- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h +++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h @@ -112,7 +112,9 @@ union acpi_object *skl_int3472_get_acpi_buffer(struct acpi_device *adev, char *id); int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb); int skl_int3472_register_clock(struct int3472_discrete_device *int3472); + int skl_int3472_register_regulator(struct int3472_discrete_device *int3472, struct acpi_resource_gpio *agpio); +void skl_int3472_unregister_regulator(struct int3472_discrete_device *int3472); #endif diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c b/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c index fd681d2a73fe..2638d375e226 100644 --- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c +++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c @@ -400,15 +400,15 @@ int skl_int3472_discrete_remove(struct platform_device *pdev) struct int3472_discrete_device *int3472 = platform_get_drvdata(pdev); gpiod_remove_lookup_table(&int3472->gpios); - regulator_unregister(int3472->regulator.rdev); clk_unregister(int3472->clock.clk); if (int3472->clock.cl) clkdev_drop(int3472->clock.cl); - gpiod_put(int3472->regulator.gpio); gpiod_put(int3472->clock.ena_gpio); gpiod_put(int3472->clock.led_gpio); + skl_int3472_unregister_regulator(int3472); + return 0; } |