lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 195/205] power: supply: max8998-charger: Fix platform data retrieval
    Date
    From: Tomasz Figa <tomasz.figa@gmail.com>

    [ Upstream commit cb90a2c6f77fe9b43d1e3f759bb2f13fe7fa1811 ]

    Since the max8998 MFD driver supports instantiation by DT, platform data
    retrieval is handled in MFD probe and cell drivers should get use
    the pdata field of max8998_dev struct to obtain them.

    Fixes: ee999fb3f17f ("mfd: max8998: Add support for Device Tree")
    Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
    Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
    Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/power/supply/max8998_charger.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/power/supply/max8998_charger.c b/drivers/power/supply/max8998_charger.c
    index cad7d1a8feec7..aa65e6c36c55e 100644
    --- a/drivers/power/supply/max8998_charger.c
    +++ b/drivers/power/supply/max8998_charger.c
    @@ -86,7 +86,7 @@ static const struct power_supply_desc max8998_battery_desc = {
    static int max8998_battery_probe(struct platform_device *pdev)
    {
    struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);
    - struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);
    + struct max8998_platform_data *pdata = iodev->pdata;
    struct power_supply_config psy_cfg = {};
    struct max8998_battery_data *max8998;
    struct i2c_client *i2c;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-08 12:43    [W:2.235 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site