lkml.org 
[lkml]   [2024]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 06/19] power: reset: tps65086-restart: Remove unneeded device data struct
    Date
    We only need one member of the struct tps65086_restart, pass that
    tps65086_restart_notify() directly. Remove that struct and its
    allocation.

    Signed-off-by: Andrew Davis <afd@ti.com>
    ---
    drivers/power/reset/tps65086-restart.c | 35 ++++++--------------------
    1 file changed, 8 insertions(+), 27 deletions(-)

    diff --git a/drivers/power/reset/tps65086-restart.c b/drivers/power/reset/tps65086-restart.c
    index 82d7a761a0385..6976dbcac74fa 100644
    --- a/drivers/power/reset/tps65086-restart.c
    +++ b/drivers/power/reset/tps65086-restart.c
    @@ -9,19 +9,14 @@
    #include <linux/platform_device.h>
    #include <linux/reboot.h>

    -struct tps65086_restart {
    - struct device *dev;
    -};
    -
    static int tps65086_restart_notify(struct sys_off_data *data)
    {
    - struct tps65086_restart *tps65086_restart = data->cb_data;
    - struct tps65086 *tps65086 = dev_get_drvdata(tps65086_restart->dev->parent);
    + struct tps65086 *tps65086 = data->cb_data;
    int ret;

    ret = regmap_write(tps65086->regmap, TPS65086_FORCESHUTDN, 1);
    if (ret) {
    - dev_err(tps65086_restart->dev, "%s: error writing to tps65086 pmic: %d\n",
    + dev_err(tps65086->dev, "%s: error writing to tps65086 pmic: %d\n",
    __func__, ret);
    return NOTIFY_DONE;
    }
    @@ -36,27 +31,13 @@ static int tps65086_restart_notify(struct sys_off_data *data)

    static int tps65086_restart_probe(struct platform_device *pdev)
    {
    - struct tps65086_restart *tps65086_restart;
    - int ret;
    -
    - tps65086_restart = devm_kzalloc(&pdev->dev, sizeof(*tps65086_restart), GFP_KERNEL);
    - if (!tps65086_restart)
    - return -ENOMEM;
    -
    - tps65086_restart->dev = &pdev->dev;
    -
    - ret = devm_register_sys_off_handler(&pdev->dev,
    - SYS_OFF_MODE_RESTART,
    - SYS_OFF_PRIO_HIGH,
    - tps65086_restart_notify,
    - tps65086_restart);
    - if (ret) {
    - dev_err(&pdev->dev, "%s: cannot register restart handler: %d\n",
    - __func__, ret);
    - return -ENODEV;
    - }
    + struct tps65086 *tps65086 = dev_get_drvdata(pdev->dev.parent);

    - return 0;
    + return devm_register_sys_off_handler(&pdev->dev,
    + SYS_OFF_MODE_RESTART,
    + SYS_OFF_PRIO_HIGH,
    + tps65086_restart_notify,
    + tps65086);
    }

    static const struct platform_device_id tps65086_restart_id_table[] = {
    --
    2.39.2

    \
     
     \ /
      Last update: 2024-05-27 14:55    [W:3.232 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site