Linux-ACPI Archive on lore.kernel.org
 help / color / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Charles Keepax <ckeepax@opensource.cirrus.com>
Cc: wsa@the-dreams.de, mika.westerberg@linux.intel.com,
	jarkko.nikula@linux.intel.com, linux-i2c@vger.kernel.org,
	linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
	benjamin.tissoires@redhat.com, jbroadus@gmail.com,
	patches@opensource.cirrus.com
Subject: Re: [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time
Date: Tue, 4 Jun 2019 20:04:04 +0300
Message-ID: <20190604170404.GR9224@smile.fi.intel.com> (raw)
In-Reply-To: <20190528142900.24147-4-ckeepax@opensource.cirrus.com>

On Tue, May 28, 2019 at 03:28:58PM +0100, Charles Keepax wrote:
> Bring the ACPI path in sync with the device tree path and handle all the
> IRQ fetching at probe time. This leaves the only IRQ handling at device
> registration time being that which is passed directly through the board
> info as either a resource or an actual IRQ number.
> 

It seems my comments weren't addressed by one or another reason.
This one I would rather to split with exporting function as a separate patch.

> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> ---
> 
> Changes since v2:
>  - Add kernel doc for i2c_acpi_get_irq
> 
> Thanks,
> Charles
> 
>  drivers/i2c/i2c-core-acpi.c | 16 ++++++++++------
>  drivers/i2c/i2c-core-base.c |  5 ++++-
>  drivers/i2c/i2c-core.h      |  7 +++++++
>  3 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
> index c107f260e252f..62a938c17cbd2 100644
> --- a/drivers/i2c/i2c-core-acpi.c
> +++ b/drivers/i2c/i2c-core-acpi.c
> @@ -148,8 +148,17 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
>  	return 1; /* No need to add resource to the list */
>  }
>  
> -static int i2c_acpi_get_irq(struct acpi_device *adev)
> +/**
> + * i2c_acpi_get_irq - get device IRQ number from ACPI
> + * @client: Pointer to the I2C client device
> + *
> + * Find the IRQ number used by a specific client device.
> + *
> + * Return: The IRQ number or an error code.
> + */
> +int i2c_acpi_get_irq(struct i2c_client *client)
>  {
> +	struct acpi_device *adev = ACPI_COMPANION(&client->adapter->dev);
>  	struct list_head resource_list;
>  	int irq = -ENOENT;
>  	int ret;
> @@ -201,11 +210,6 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
>  	if (adapter_handle)
>  		*adapter_handle = lookup.adapter_handle;
>  
> -	/* Then fill IRQ number if any */
> -	ret = i2c_acpi_get_irq(adev);
> -	if (ret > 0)
> -		info->irq = ret;
> -
>  	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
>  			  sizeof(info->type));
>  
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 84bf11b25a120..b6b009bfe842b 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -335,7 +335,10 @@ static int i2c_device_probe(struct device *dev)
>  			if (irq == -EINVAL || irq == -ENODATA)
>  				irq = of_irq_get(dev->of_node, 0);
>  		} else if (ACPI_COMPANION(dev)) {
> -			irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
> +			irq = i2c_acpi_get_irq(client);
> +
> +			if (irq == -ENOENT)
> +				irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
>  		}
>  		if (irq == -EPROBE_DEFER)
>  			return irq;
> diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
> index 8f3a08dc73a25..15c1411f35f07 100644
> --- a/drivers/i2c/i2c-core.h
> +++ b/drivers/i2c/i2c-core.h
> @@ -72,6 +72,8 @@ const struct acpi_device_id *
>  i2c_acpi_match_device(const struct acpi_device_id *matches,
>  		      struct i2c_client *client);
>  void i2c_acpi_register_devices(struct i2c_adapter *adap);
> +
> +int i2c_acpi_get_irq(struct i2c_client *client);
>  #else /* CONFIG_ACPI */
>  static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
>  static inline const struct acpi_device_id *
> @@ -80,6 +82,11 @@ i2c_acpi_match_device(const struct acpi_device_id *matches,
>  {
>  	return NULL;
>  }
> +
> +static inline int i2c_acpi_get_irq(struct i2c_client *client)
> +{
> +	return 0;
> +}
>  #endif /* CONFIG_ACPI */
>  extern struct notifier_block i2c_acpi_notifier;
>  
> -- 
> 2.11.0
> 

-- 
With Best Regards,
Andy Shevchenko



  parent reply index

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-05-29  7:35   ` Mika Westerberg
2019-06-04 17:00   ` Andy Shevchenko
2019-06-05  8:26     ` Charles Keepax
2019-05-28 14:28 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-05-29  7:36   ` Mika Westerberg
2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-05-29  7:43   ` Mika Westerberg
2019-06-04 17:04   ` Andy Shevchenko [this message]
2019-06-05  8:22     ` Charles Keepax
2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-05-29  7:43   ` Mika Westerberg
2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
2019-05-29  7:44   ` Mika Westerberg
2019-05-29  7:34 ` [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Mika Westerberg

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190604170404.GR9224@smile.fi.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=ckeepax@opensource.cirrus.com \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=jbroadus@gmail.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=patches@opensource.cirrus.com \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-ACPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-acpi/0 linux-acpi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-acpi linux-acpi/ https://lore.kernel.org/linux-acpi \
		linux-acpi@vger.kernel.org
	public-inbox-index linux-acpi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-acpi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git