gpiolib: acpi: make acpi_can_fallback_to_crs() static
diff mbox series

Message ID 20190904172624.GA76617@dtor-ws
State Queued, archived
Headers show
Series
  • gpiolib: acpi: make acpi_can_fallback_to_crs() static
Related show

Commit Message

Dmitry Torokhov Sept. 4, 2019, 5:26 p.m. UTC
It is not used outside gpiolib-acpi.c module, so there is no need to
export it.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/gpio/gpiolib-acpi.c | 19 ++++++++++---------
 drivers/gpio/gpiolib-acpi.h |  8 --------
 2 files changed, 10 insertions(+), 17 deletions(-)

Comments

Andy Shevchenko Sept. 4, 2019, 5:33 p.m. UTC | #1
On Wed, Sep 04, 2019 at 10:26:24AM -0700, Dmitry Torokhov wrote:
> It is not used outside gpiolib-acpi.c module, so there is no need to
> export it.
> 

Thank you for a nice clean up!
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/gpio/gpiolib-acpi.c | 19 ++++++++++---------
>  drivers/gpio/gpiolib-acpi.h |  8 --------
>  2 files changed, 10 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
> index fdee8afa5339..2b6fdc9947f7 100644
> --- a/drivers/gpio/gpiolib-acpi.c
> +++ b/drivers/gpio/gpiolib-acpi.c
> @@ -728,6 +728,16 @@ static struct gpio_desc *acpi_get_gpiod_by_index(struct acpi_device *adev,
>  	return ret ? ERR_PTR(ret) : lookup.desc;
>  }
>  
> +static bool acpi_can_fallback_to_crs(struct acpi_device *adev,
> +				     const char *con_id)
> +{
> +	/* Never allow fallback if the device has properties */
> +	if (acpi_dev_has_props(adev) || adev->driver_gpios)
> +		return false;
> +
> +	return con_id == NULL;
> +}
> +
>  struct gpio_desc *acpi_find_gpio(struct device *dev,
>  				 const char *con_id,
>  				 unsigned int idx,
> @@ -1264,15 +1274,6 @@ int acpi_gpio_count(struct device *dev, const char *con_id)
>  	return count ? count : -ENOENT;
>  }
>  
> -bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id)
> -{
> -	/* Never allow fallback if the device has properties */
> -	if (acpi_dev_has_props(adev) || adev->driver_gpios)
> -		return false;
> -
> -	return con_id == NULL;
> -}
> -
>  /* Run deferred acpi_gpiochip_request_irqs() */
>  static int acpi_gpio_handle_deferred_request_irqs(void)
>  {
> diff --git a/drivers/gpio/gpiolib-acpi.h b/drivers/gpio/gpiolib-acpi.h
> index d7241b432b8b..1c6d65cf0629 100644
> --- a/drivers/gpio/gpiolib-acpi.h
> +++ b/drivers/gpio/gpiolib-acpi.h
> @@ -52,8 +52,6 @@ struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode,
>  				      struct acpi_gpio_info *info);
>  
>  int acpi_gpio_count(struct device *dev, const char *con_id);
> -
> -bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id);
>  #else
>  static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
>  static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
> @@ -93,12 +91,6 @@ static inline int acpi_gpio_count(struct device *dev, const char *con_id)
>  {
>  	return -ENODEV;
>  }
> -
> -static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev,
> -					    const char *con_id)
> -{
> -	return false;
> -}
>  #endif
>  
>  #endif /* GPIOLIB_ACPI_H */
> -- 
> 2.23.0.187.g17f5b7556c-goog
> 
> 
> -- 
> Dmitry
Mika Westerberg Sept. 5, 2019, 5:03 a.m. UTC | #2
On Wed, Sep 04, 2019 at 10:26:24AM -0700, Dmitry Torokhov wrote:
> It is not used outside gpiolib-acpi.c module, so there is no need to
> export it.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Linus Walleij Sept. 10, 2019, 10:35 a.m. UTC | #3
On Wed, Sep 4, 2019 at 6:26 PM Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:

> It is not used outside gpiolib-acpi.c module, so there is no need to
> export it.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Patch applied with the ACKs.

Yours,
Linus Walleij

Patch
diff mbox series

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index fdee8afa5339..2b6fdc9947f7 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -728,6 +728,16 @@  static struct gpio_desc *acpi_get_gpiod_by_index(struct acpi_device *adev,
 	return ret ? ERR_PTR(ret) : lookup.desc;
 }
 
+static bool acpi_can_fallback_to_crs(struct acpi_device *adev,
+				     const char *con_id)
+{
+	/* Never allow fallback if the device has properties */
+	if (acpi_dev_has_props(adev) || adev->driver_gpios)
+		return false;
+
+	return con_id == NULL;
+}
+
 struct gpio_desc *acpi_find_gpio(struct device *dev,
 				 const char *con_id,
 				 unsigned int idx,
@@ -1264,15 +1274,6 @@  int acpi_gpio_count(struct device *dev, const char *con_id)
 	return count ? count : -ENOENT;
 }
 
-bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id)
-{
-	/* Never allow fallback if the device has properties */
-	if (acpi_dev_has_props(adev) || adev->driver_gpios)
-		return false;
-
-	return con_id == NULL;
-}
-
 /* Run deferred acpi_gpiochip_request_irqs() */
 static int acpi_gpio_handle_deferred_request_irqs(void)
 {
diff --git a/drivers/gpio/gpiolib-acpi.h b/drivers/gpio/gpiolib-acpi.h
index d7241b432b8b..1c6d65cf0629 100644
--- a/drivers/gpio/gpiolib-acpi.h
+++ b/drivers/gpio/gpiolib-acpi.h
@@ -52,8 +52,6 @@  struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode,
 				      struct acpi_gpio_info *info);
 
 int acpi_gpio_count(struct device *dev, const char *con_id);
-
-bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id);
 #else
 static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
 static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
@@ -93,12 +91,6 @@  static inline int acpi_gpio_count(struct device *dev, const char *con_id)
 {
 	return -ENODEV;
 }
-
-static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev,
-					    const char *con_id)
-{
-	return false;
-}
 #endif
 
 #endif /* GPIOLIB_ACPI_H */