lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 402/545] mfd: t7l66xb: Drop platform disable callback
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    [ Upstream commit 128ac294e1b437cb8a7f2ff8ede1cde9082bddbe ]

    None of the in-tree instantiations of struct t7l66xb_platform_data
    provides a disable callback. So better don't dereference this function
    pointer unconditionally. As there is no user, drop it completely instead
    of calling it conditional.

    This is a preparation for making platform remove callbacks return void.

    Fixes: 1f192015ca5b ("mfd: driver for the T7L66XB TMIO SoC")
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Link: https://lore.kernel.org/r/20220530192430.2108217-3-u.kleine-koenig@pengutronix.de
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/t7l66xb.c | 6 +-----
    include/linux/mfd/t7l66xb.h | 1 -
    2 files changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
    index 70da0c4ae457..58811c5ab564 100644
    --- a/drivers/mfd/t7l66xb.c
    +++ b/drivers/mfd/t7l66xb.c
    @@ -405,11 +405,8 @@ static int t7l66xb_probe(struct platform_device *dev)

    static int t7l66xb_remove(struct platform_device *dev)
    {
    - struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev);
    struct t7l66xb *t7l66xb = platform_get_drvdata(dev);
    - int ret;

    - ret = pdata->disable(dev);
    clk_disable_unprepare(t7l66xb->clk48m);
    clk_put(t7l66xb->clk48m);
    clk_disable_unprepare(t7l66xb->clk32k);
    @@ -420,8 +417,7 @@ static int t7l66xb_remove(struct platform_device *dev)
    mfd_remove_devices(&dev->dev);
    kfree(t7l66xb);

    - return ret;
    -
    + return 0;
    }

    static struct platform_driver t7l66xb_platform_driver = {
    diff --git a/include/linux/mfd/t7l66xb.h b/include/linux/mfd/t7l66xb.h
    index 69632c1b07bd..ae3e7a5c5219 100644
    --- a/include/linux/mfd/t7l66xb.h
    +++ b/include/linux/mfd/t7l66xb.h
    @@ -12,7 +12,6 @@

    struct t7l66xb_platform_data {
    int (*enable)(struct platform_device *dev);
    - int (*disable)(struct platform_device *dev);
    int (*suspend)(struct platform_device *dev);
    int (*resume)(struct platform_device *dev);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:37    [W:4.041 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site