lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 847/849] pinctrl: amd: Add irq field data
    Date
    From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>

    commit 7e6f8d6f4a42ef9b693ff1b49267c546931d4619 upstream.

    pinctrl_amd use gpiochip_get_data() to get their local state containers
    back from the gpiochip passed as amd_gpio chip data.

    Hence added irq field data to get directly using amd_gpio chip data.

    Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
    Tested-by: Mario Limonciello <mario.limonciello@amd.com>
    Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
    Link: https://lore.kernel.org/r/20210831120613.1514899-2-Basavaraj.Natikar@amd.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/pinctrl/pinctrl-amd.c | 9 ++++-----
    drivers/pinctrl/pinctrl-amd.h | 1 +
    2 files changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/pinctrl/pinctrl-amd.c
    +++ b/drivers/pinctrl/pinctrl-amd.c
    @@ -932,7 +932,6 @@ static struct pinctrl_desc amd_pinctrl_d
    static int amd_gpio_probe(struct platform_device *pdev)
    {
    int ret = 0;
    - int irq_base;
    struct resource *res;
    struct amd_gpio *gpio_dev;
    struct gpio_irq_chip *girq;
    @@ -955,9 +954,9 @@ static int amd_gpio_probe(struct platfor
    if (!gpio_dev->base)
    return -ENOMEM;

    - irq_base = platform_get_irq(pdev, 0);
    - if (irq_base < 0)
    - return irq_base;
    + gpio_dev->irq = platform_get_irq(pdev, 0);
    + if (gpio_dev->irq < 0)
    + return gpio_dev->irq;

    #ifdef CONFIG_PM_SLEEP
    gpio_dev->saved_regs = devm_kcalloc(&pdev->dev, amd_pinctrl_desc.npins,
    @@ -1020,7 +1019,7 @@ static int amd_gpio_probe(struct platfor
    goto out2;
    }

    - ret = devm_request_irq(&pdev->dev, irq_base, amd_gpio_irq_handler,
    + ret = devm_request_irq(&pdev->dev, gpio_dev->irq, amd_gpio_irq_handler,
    IRQF_SHARED, KBUILD_MODNAME, gpio_dev);
    if (ret)
    goto out2;
    --- a/drivers/pinctrl/pinctrl-amd.h
    +++ b/drivers/pinctrl/pinctrl-amd.h
    @@ -98,6 +98,7 @@ struct amd_gpio {
    struct resource *res;
    struct platform_device *pdev;
    u32 *saved_regs;
    + int irq;
    };

    /* KERNCZ configuration*/

    \
     
     \ /
      Last update: 2021-11-16 00:27    [W:2.714 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site