[PATCH v3 1/3] ACPI: bus: Constify stubs for CONFIG_ACPI=n case

[PATCH v3 1/3] ACPI: bus: Constify stubs for CONFIG_ACPI=n case

[Andy Shevchenko]

There is a few stubs that left untouched during constification of
the fwnode related APIs. Constify three more stubs here.

Fixes: 8b9d6802583a ("ACPI: Constify acpi_bus helper functions, switch to macros")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: no changes
v2: new fix
 include/linux/acpi.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index c60745f657e9..40657f220f8b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -765,7 +765,7 @@ static inline bool is_acpi_device_node(const struct fwnode_handle *fwnode)
 	return false;
 }
 
-static inline struct acpi_device *to_acpi_device_node(struct fwnode_handle *fwnode)
+static inline struct acpi_device *to_acpi_device_node(const struct fwnode_handle *fwnode)
 {
 	return NULL;
 }
@@ -775,12 +775,12 @@ static inline bool is_acpi_data_node(const struct fwnode_handle *fwnode)
 	return false;
 }
 
-static inline struct acpi_data_node *to_acpi_data_node(struct fwnode_handle *fwnode)
+static inline struct acpi_data_node *to_acpi_data_node(const struct fwnode_handle *fwnode)
 {
 	return NULL;
 }
 
-static inline bool acpi_data_node_match(struct fwnode_handle *fwnode,
+static inline bool acpi_data_node_match(const struct fwnode_handle *fwnode,
 					const char *name)
 {
 	return false;
-- 
2.30.2

[PATCH v3 2/3] ACPI: bus: Constify acpi_dma_supported() helper function

[Andy Shevchenko]

Constify arguments to acpi_dma_supported(). The function doesn't need
to change the content of the passed argument and when it's const it
allows to supply the result of other functions that may return a pointer
to a constant object.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: new patch
 drivers/acpi/scan.c     | 2 +-
 include/acpi/acpi_bus.h | 2 +-
 include/linux/acpi.h    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a2df7bcf4d07..5040ce3c3ed1 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1405,7 +1405,7 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp)
  *
  * Return false if DMA is not supported. Otherwise, return true
  */
-bool acpi_dma_supported(struct acpi_device *adev)
+bool acpi_dma_supported(const struct acpi_device *adev)
 {
 	if (!adev)
 		return false;
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 3a82faac5767..2fbd2c2e0568 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -586,7 +586,7 @@ struct acpi_pci_root {
 
 /* helper */
 
-bool acpi_dma_supported(struct acpi_device *adev);
+bool acpi_dma_supported(const struct acpi_device *adev);
 enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev);
 int acpi_dma_get_range(struct device *dev, u64 *dma_addr, u64 *offset,
 		       u64 *size);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 40657f220f8b..97f1c5588b5a 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -911,7 +911,7 @@ acpi_create_platform_device(struct acpi_device *adev,
 	return NULL;
 }
 
-static inline bool acpi_dma_supported(struct acpi_device *adev)
+static inline bool acpi_dma_supported(const struct acpi_device *adev)
 {
 	return false;
 }
-- 
2.30.2

[PATCH v3 3/3] device property: Unify access to of_node

[Andy Shevchenko]

Historically we have a few variants how we access dev->fwnode
and dev->of_node. Some of the functions during development
gained different versions of the getters. Unify access to of_node
and as a side change slightly refactor ACPI specific branches.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v3: no changes
v2: no changes
 drivers/base/property.c  | 29 +++++++++++++----------------
 include/linux/property.h |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/drivers/base/property.c b/drivers/base/property.c
index c26370aacdc6..d0874f6c29bb 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -759,13 +759,8 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_available_child_node);
 struct fwnode_handle *device_get_next_child_node(struct device *dev,
 						 struct fwnode_handle *child)
 {
-	struct acpi_device *adev = ACPI_COMPANION(dev);
-	struct fwnode_handle *fwnode = NULL, *next;
-
-	if (dev->of_node)
-		fwnode = of_fwnode_handle(dev->of_node);
-	else if (adev)
-		fwnode = acpi_fwnode_handle(adev);
+	const struct fwnode_handle *fwnode = dev_fwnode(dev);
+	struct fwnode_handle *next;
 
 	/* Try to find a child in primary fwnode */
 	next = fwnode_get_next_child_node(fwnode, child);
@@ -868,28 +863,31 @@ EXPORT_SYMBOL_GPL(device_get_child_node_count);
 
 bool device_dma_supported(struct device *dev)
 {
+	const struct fwnode_handle *fwnode = dev_fwnode(dev);
+
 	/* For DT, this is always supported.
 	 * For ACPI, this depends on CCA, which
 	 * is determined by the acpi_dma_supported().
 	 */
-	if (IS_ENABLED(CONFIG_OF) && dev->of_node)
+	if (is_of_node(fwnode))
 		return true;
 
-	return acpi_dma_supported(ACPI_COMPANION(dev));
+	return acpi_dma_supported(to_acpi_device_node(fwnode));
 }
 EXPORT_SYMBOL_GPL(device_dma_supported);
 
 enum dev_dma_attr device_get_dma_attr(struct device *dev)
 {
+	const struct fwnode_handle *fwnode = dev_fwnode(dev);
 	enum dev_dma_attr attr = DEV_DMA_NOT_SUPPORTED;
 
-	if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
-		if (of_dma_is_coherent(dev->of_node))
+	if (is_of_node(fwnode)) {
+		if (of_dma_is_coherent(to_of_node(fwnode)))
 			attr = DEV_DMA_COHERENT;
 		else
 			attr = DEV_DMA_NON_COHERENT;
 	} else
-		attr = acpi_get_dma_attr(ACPI_COMPANION(dev));
+		attr = acpi_get_dma_attr(to_acpi_device_node(fwnode));
 
 	return attr;
 }
@@ -1007,14 +1005,13 @@ EXPORT_SYMBOL(device_get_mac_address);
  * Returns Linux IRQ number on success. Other values are determined
  * accordingly to acpi_/of_ irq_get() operation.
  */
-int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index)
+int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index)
 {
-	struct device_node *of_node = to_of_node(fwnode);
 	struct resource res;
 	int ret;
 
-	if (IS_ENABLED(CONFIG_OF) && of_node)
-		return of_irq_get(of_node, index);
+	if (is_of_node(fwnode))
+		return of_irq_get(to_of_node(fwnode), index);
 
 	ret = acpi_irq_get(ACPI_HANDLE_FWNODE(fwnode), index, &res);
 	if (ret)
diff --git a/include/linux/property.h b/include/linux/property.h
index 0d876316e61d..073e680c35e2 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -119,7 +119,7 @@ struct fwnode_handle *device_get_named_child_node(struct device *dev,
 struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);
 void fwnode_handle_put(struct fwnode_handle *fwnode);
 
-int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index);
+int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index);
 
 unsigned int device_get_child_node_count(struct device *dev);
 
-- 
2.30.2

Re: [PATCH v3 3/3] device property: Unify access to of_node

[Rafael J. Wysocki]

On Fri, Jun 4, 2021 at 6:50 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> Historically we have a few variants how we access dev->fwnode
> and dev->of_node. Some of the functions during development
> gained different versions of the getters. Unify access to of_node
> and as a side change slightly refactor ACPI specific branches.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v3: no changes
> v2: no changes
>  drivers/base/property.c  | 29 +++++++++++++----------------
>  include/linux/property.h |  2 +-
>  2 files changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index c26370aacdc6..d0874f6c29bb 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -759,13 +759,8 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_available_child_node);
>  struct fwnode_handle *device_get_next_child_node(struct device *dev,
>                                                  struct fwnode_handle *child)
>  {
> -       struct acpi_device *adev = ACPI_COMPANION(dev);
> -       struct fwnode_handle *fwnode = NULL, *next;
> -
> -       if (dev->of_node)
> -               fwnode = of_fwnode_handle(dev->of_node);
> -       else if (adev)
> -               fwnode = acpi_fwnode_handle(adev);
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
> +       struct fwnode_handle *next;
>
>         /* Try to find a child in primary fwnode */
>         next = fwnode_get_next_child_node(fwnode, child);
> @@ -868,28 +863,31 @@ EXPORT_SYMBOL_GPL(device_get_child_node_count);
>
>  bool device_dma_supported(struct device *dev)
>  {
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
> +
>         /* For DT, this is always supported.
>          * For ACPI, this depends on CCA, which
>          * is determined by the acpi_dma_supported().
>          */
> -       if (IS_ENABLED(CONFIG_OF) && dev->of_node)
> +       if (is_of_node(fwnode))
>                 return true;
>
> -       return acpi_dma_supported(ACPI_COMPANION(dev));
> +       return acpi_dma_supported(to_acpi_device_node(fwnode));
>  }
>  EXPORT_SYMBOL_GPL(device_dma_supported);
>
>  enum dev_dma_attr device_get_dma_attr(struct device *dev)
>  {
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
>         enum dev_dma_attr attr = DEV_DMA_NOT_SUPPORTED;
>
> -       if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
> -               if (of_dma_is_coherent(dev->of_node))
> +       if (is_of_node(fwnode)) {
> +               if (of_dma_is_coherent(to_of_node(fwnode)))
>                         attr = DEV_DMA_COHERENT;
>                 else
>                         attr = DEV_DMA_NON_COHERENT;
>         } else
> -               attr = acpi_get_dma_attr(ACPI_COMPANION(dev));
> +               attr = acpi_get_dma_attr(to_acpi_device_node(fwnode));
>
>         return attr;
>  }
> @@ -1007,14 +1005,13 @@ EXPORT_SYMBOL(device_get_mac_address);
>   * Returns Linux IRQ number on success. Other values are determined
>   * accordingly to acpi_/of_ irq_get() operation.
>   */
> -int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index)
> +int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index)
>  {
> -       struct device_node *of_node = to_of_node(fwnode);
>         struct resource res;
>         int ret;
>
> -       if (IS_ENABLED(CONFIG_OF) && of_node)
> -               return of_irq_get(of_node, index);
> +       if (is_of_node(fwnode))
> +               return of_irq_get(to_of_node(fwnode), index);
>
>         ret = acpi_irq_get(ACPI_HANDLE_FWNODE(fwnode), index, &res);
>         if (ret)
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 0d876316e61d..073e680c35e2 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -119,7 +119,7 @@ struct fwnode_handle *device_get_named_child_node(struct device *dev,
>  struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);
>  void fwnode_handle_put(struct fwnode_handle *fwnode);
>
> -int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index);
> +int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index);
>
>  unsigned int device_get_child_node_count(struct device *dev);
>
> --

Applied as 5.14 material along with the [1-2/3], thanks!

[Devel] Re: [PATCH v3 3/3] device property: Unify access to of_node

[Rafael J. Wysocki]

[-- Attachment #1: Type: text/plain, Size: 4440 bytes --]

On Fri, Jun 4, 2021 at 6:50 PM Andy Shevchenko
<andriy.shevchenko(a)linux.intel.com> wrote:
>
> Historically we have a few variants how we access dev->fwnode
> and dev->of_node. Some of the functions during development
> gained different versions of the getters. Unify access to of_node
> and as a side change slightly refactor ACPI specific branches.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
> ---
> v3: no changes
> v2: no changes
>  drivers/base/property.c  | 29 +++++++++++++----------------
>  include/linux/property.h |  2 +-
>  2 files changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index c26370aacdc6..d0874f6c29bb 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -759,13 +759,8 @@ EXPORT_SYMBOL_GPL(fwnode_get_next_available_child_node);
>  struct fwnode_handle *device_get_next_child_node(struct device *dev,
>                                                  struct fwnode_handle *child)
>  {
> -       struct acpi_device *adev = ACPI_COMPANION(dev);
> -       struct fwnode_handle *fwnode = NULL, *next;
> -
> -       if (dev->of_node)
> -               fwnode = of_fwnode_handle(dev->of_node);
> -       else if (adev)
> -               fwnode = acpi_fwnode_handle(adev);
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
> +       struct fwnode_handle *next;
>
>         /* Try to find a child in primary fwnode */
>         next = fwnode_get_next_child_node(fwnode, child);
> @@ -868,28 +863,31 @@ EXPORT_SYMBOL_GPL(device_get_child_node_count);
>
>  bool device_dma_supported(struct device *dev)
>  {
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
> +
>         /* For DT, this is always supported.
>          * For ACPI, this depends on CCA, which
>          * is determined by the acpi_dma_supported().
>          */
> -       if (IS_ENABLED(CONFIG_OF) && dev->of_node)
> +       if (is_of_node(fwnode))
>                 return true;
>
> -       return acpi_dma_supported(ACPI_COMPANION(dev));
> +       return acpi_dma_supported(to_acpi_device_node(fwnode));
>  }
>  EXPORT_SYMBOL_GPL(device_dma_supported);
>
>  enum dev_dma_attr device_get_dma_attr(struct device *dev)
>  {
> +       const struct fwnode_handle *fwnode = dev_fwnode(dev);
>         enum dev_dma_attr attr = DEV_DMA_NOT_SUPPORTED;
>
> -       if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
> -               if (of_dma_is_coherent(dev->of_node))
> +       if (is_of_node(fwnode)) {
> +               if (of_dma_is_coherent(to_of_node(fwnode)))
>                         attr = DEV_DMA_COHERENT;
>                 else
>                         attr = DEV_DMA_NON_COHERENT;
>         } else
> -               attr = acpi_get_dma_attr(ACPI_COMPANION(dev));
> +               attr = acpi_get_dma_attr(to_acpi_device_node(fwnode));
>
>         return attr;
>  }
> @@ -1007,14 +1005,13 @@ EXPORT_SYMBOL(device_get_mac_address);
>   * Returns Linux IRQ number on success. Other values are determined
>   * accordingly to acpi_/of_ irq_get() operation.
>   */
> -int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index)
> +int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index)
>  {
> -       struct device_node *of_node = to_of_node(fwnode);
>         struct resource res;
>         int ret;
>
> -       if (IS_ENABLED(CONFIG_OF) && of_node)
> -               return of_irq_get(of_node, index);
> +       if (is_of_node(fwnode))
> +               return of_irq_get(to_of_node(fwnode), index);
>
>         ret = acpi_irq_get(ACPI_HANDLE_FWNODE(fwnode), index, &res);
>         if (ret)
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 0d876316e61d..073e680c35e2 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -119,7 +119,7 @@ struct fwnode_handle *device_get_named_child_node(struct device *dev,
>  struct fwnode_handle *fwnode_handle_get(struct fwnode_handle *fwnode);
>  void fwnode_handle_put(struct fwnode_handle *fwnode);
>
> -int fwnode_irq_get(struct fwnode_handle *fwnode, unsigned int index);
> +int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index);
>
>  unsigned int device_get_child_node_count(struct device *dev);
>
> --

Applied as 5.14 material along with the [1-2/3], thanks!