lkml.org 
[lkml]   [2021]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 40/45] mfd: twl4030: Use devm_register_trivial_power_off_handler()
    Date
    Use devm_register_trivial_power_off_handler() that replaces global
    pm_power_off variable and allows to register multiple power-off handlers.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    ---
    drivers/mfd/twl4030-power.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
    index 6b36932263ba..72df4735d628 100644
    --- a/drivers/mfd/twl4030-power.c
    +++ b/drivers/mfd/twl4030-power.c
    @@ -29,6 +29,7 @@
    #include <linux/platform_device.h>
    #include <linux/of.h>
    #include <linux/of_device.h>
    +#include <linux/reboot.h>

    #include <asm/mach-types.h>

    @@ -923,7 +924,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
    }

    /* Board has to be wired properly to use this feature */
    - if (twl4030_power_use_poweroff(pdata, node) && !pm_power_off) {
    + if (twl4030_power_use_poweroff(pdata, node)) {
    /* Default for SEQ_OFFSYNC is set, lets ensure this */
    err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
    TWL4030_PM_MASTER_CFG_P123_TRANSITION);
    @@ -939,7 +940,12 @@ static int twl4030_power_probe(struct platform_device *pdev)
    }
    }

    - pm_power_off = twl4030_power_off;
    + err = devm_register_trivial_power_off_handler(&pdev->dev,
    + twl4030_power_off);
    + if (err) {
    + dev_err(&pdev->dev, "Failed to register power-off handler\n");
    + goto relock;
    + }
    }

    relock:
    --
    2.33.1
    \
     
     \ /
      Last update: 2021-10-27 23:29    [W:6.419 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site