lkml.org 
[lkml]   [2019]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 6/7] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
    Date
    It makes sense to contain all the ACPI IRQ handling in a single helper
    function.

    Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    ---
    drivers/i2c/i2c-core-acpi.c | 3 +++
    drivers/i2c/i2c-core-base.c | 3 ---
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
    index aaca1e216be66..042c1cb148bc6 100644
    --- a/drivers/i2c/i2c-core-acpi.c
    +++ b/drivers/i2c/i2c-core-acpi.c
    @@ -169,6 +169,9 @@ int i2c_acpi_get_irq(struct device *dev)

    acpi_dev_free_resource_list(&resource_list);

    + if (irq == -ENOENT)
    + irq = acpi_dev_gpio_irq_get(adev, 0);
    +
    return irq;
    }

    diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
    index 34de732598533..87a2ad8f41a76 100644
    --- a/drivers/i2c/i2c-core-base.c
    +++ b/drivers/i2c/i2c-core-base.c
    @@ -328,9 +328,6 @@ static int i2c_device_probe(struct device *dev)
    irq = of_irq_get(dev->of_node, 0);
    } else if (ACPI_COMPANION(dev)) {
    irq = i2c_acpi_get_irq(dev);
    -
    - if (irq == -ENOENT)
    - irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
    }
    if (irq == -EPROBE_DEFER)
    return irq;
    --
    2.11.0
    \
     
     \ /
      Last update: 2019-06-21 12:09    [W:2.469 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site