Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ccff852 authored by Mika Westerberg's avatar Mika Westerberg Committed by Linus Walleij
Browse files

gpio / ACPI: get rid of acpi_gpio.h 



Now that all users of acpi_gpio.h have been moved to use either the GPIO
descriptor interface or to the internal gpiolib.h we can get rid of
acpi_gpio.h entirely.

Once this is done the only interface to get GPIOs to drivers enumerated
from ACPI namespace is the descriptor based interface.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 664e3e5a

drivers/gpio/gpiolib-acpi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -12,11 +12,13 @@ 




#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/driver.h>

#include <linux/export.h>

#include <linux/export.h>

#include <linux/acpi_gpio.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>





#include "gpiolib.h"



struct acpi_gpio_evt_pin {

struct acpi_gpio_evt_pin {

	struct list_head node;

	struct list_head node;

	acpi_handle *evt_handle;

	acpi_handle *evt_handle;
@@ -307,7 +309,6 @@ struct gpio_desc *acpi_get_gpiod_by_index(struct device *dev, int index, 




	return lookup.desc ? lookup.desc : ERR_PTR(-ENOENT);

	return lookup.desc ? lookup.desc : ERR_PTR(-ENOENT);

}

}

EXPORT_SYMBOL_GPL(acpi_get_gpiod_by_index);





void acpi_gpiochip_add(struct gpio_chip *chip)

void acpi_gpiochip_add(struct gpio_chip *chip)

{

{

drivers/gpio/gpiolib.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/acpi_gpio.h>

#include <linux/idr.h>

#include <linux/idr.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/acpi.h>

#include <linux/acpi.h>

drivers/gpio/gpiolib.h

+23 −0
Original line number Original line Diff line number Diff line
@@ -12,12 +12,35 @@ 
#ifndef GPIOLIB_H

#ifndef GPIOLIB_H

#define GPIOLIB_H

#define GPIOLIB_H





#include <linux/err.h>

#include <linux/device.h>



/**

 * struct acpi_gpio_info - ACPI GPIO specific information

 * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo

 * @active_low: in case of @gpioint, the pin is active low

 */

struct acpi_gpio_info {

	bool gpioint;

	bool active_low;

};



#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

void acpi_gpiochip_add(struct gpio_chip *chip);

void acpi_gpiochip_add(struct gpio_chip *chip);

void acpi_gpiochip_remove(struct gpio_chip *chip);

void acpi_gpiochip_remove(struct gpio_chip *chip);



struct gpio_desc *acpi_get_gpiod_by_index(struct device *dev, int index,

					  struct acpi_gpio_info *info);

#else

#else

static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }

static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }

static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }

static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }



static inline struct gpio_desc *

acpi_get_gpiod_by_index(struct device *dev, int index,

			struct acpi_gpio_info *info)

{

	return ERR_PTR(-ENOSYS);

}

#endif

#endif





#endif /* GPIOLIB_H */
 
#endif /* GPIOLIB_H */

include/linux/acpi_gpio.h

deleted100644 → 0
+0 −45
Original line number Original line Diff line number Diff line 
#ifndef _LINUX_ACPI_GPIO_H_

#define _LINUX_ACPI_GPIO_H_



#include <linux/device.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>



/**

 * struct acpi_gpio_info - ACPI GPIO specific information

 * @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo

 * @active_low: in case of @gpioint, the pin is active low

 */

struct acpi_gpio_info {

	bool gpioint;

	bool active_low;

};



#ifdef CONFIG_GPIO_ACPI



struct gpio_desc *acpi_get_gpiod_by_index(struct device *dev, int index,

					  struct acpi_gpio_info *info);

#else /* CONFIG_GPIO_ACPI */



static inline struct gpio_desc *

acpi_get_gpiod_by_index(struct device *dev, int index,

			struct acpi_gpio_info *info)

{

	return ERR_PTR(-ENOSYS);

}



#endif /* CONFIG_GPIO_ACPI */



static inline int acpi_get_gpio_by_index(struct device *dev, int index,

					 struct acpi_gpio_info *info)

{

	struct gpio_desc *desc = acpi_get_gpiod_by_index(dev, index, info);



	if (IS_ERR(desc))

		return PTR_ERR(desc);

	return desc_to_gpio(desc);

}



#endif /* _LINUX_ACPI_GPIO_H_ */