lkml.org 
[lkml]   [2021]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 6/8] platform/x86: intel_skl_int3472: Provide skl_int3472_unregister_clock()
    Date
    For the sake of APIs to be properly layered provide
    skl_int3472_unregister_clock().

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    v2: new patch
    .../x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c | 6 ++++++
    .../platform/x86/intel-int3472/intel_skl_int3472_common.h | 2 ++
    .../platform/x86/intel-int3472/intel_skl_int3472_discrete.c | 5 ++---
    3 files changed, 10 insertions(+), 3 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 60c7128f44ee..1700e7557a82 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
    @@ -130,6 +130,12 @@ int skl_int3472_register_clock(struct int3472_discrete_device *int3472)
    return ret;
    }

    +void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472)
    +{
    + clkdev_drop(int3472->clock.cl);
    + clk_unregister(int3472->clock.clk);
    +}
    +
    int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
    struct acpi_resource_gpio *agpio)
    {
    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 50f73c6eab44..714fde73b524 100644
    --- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h
    +++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h
    @@ -111,7 +111,9 @@ int skl_int3472_tps68470_probe(struct i2c_client *client);
    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);
    +void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472);

    int skl_int3472_register_regulator(struct int3472_discrete_device *int3472,
    struct acpi_resource_gpio *agpio);
    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 2638d375e226..17c6fe830765 100644
    --- a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c
    +++ b/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c
    @@ -400,10 +400,9 @@ int skl_int3472_discrete_remove(struct platform_device *pdev)
    struct int3472_discrete_device *int3472 = platform_get_drvdata(pdev);

    gpiod_remove_lookup_table(&int3472->gpios);
    - clk_unregister(int3472->clock.clk);

    - if (int3472->clock.cl)
    - clkdev_drop(int3472->clock.cl);
    + if (int3472->clock.ena_gpio)
    + skl_int3472_unregister_clock(int3472);

    gpiod_put(int3472->clock.ena_gpio);
    gpiod_put(int3472->clock.led_gpio);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-18 14:56    [W:3.094 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site