gpio: acpi: Add managed variant of acpi_dev_add_driver_gpios()
Introduce device managed variant of acpi_dev_add_driver_gpios() and its counterpart acpi_dev_remove_driver_gpios(). The functions in most cases are used in driver's ->probe() and ->remove() callbacks, that's why it's useful to have managed variant of them. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Rafael J. Wysocki <rjw@rjwysocki.net> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
ff21378a32
commit
85c73d50e5
|
@ -362,6 +362,37 @@ int acpi_dev_add_driver_gpios(struct acpi_device *adev,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(acpi_dev_add_driver_gpios);
|
EXPORT_SYMBOL_GPL(acpi_dev_add_driver_gpios);
|
||||||
|
|
||||||
|
static void devm_acpi_dev_release_driver_gpios(struct device *dev, void *res)
|
||||||
|
{
|
||||||
|
acpi_dev_remove_driver_gpios(ACPI_COMPANION(dev));
|
||||||
|
}
|
||||||
|
|
||||||
|
int devm_acpi_dev_add_driver_gpios(struct device *dev,
|
||||||
|
const struct acpi_gpio_mapping *gpios)
|
||||||
|
{
|
||||||
|
void *res;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
res = devres_alloc(devm_acpi_dev_release_driver_gpios, 0, GFP_KERNEL);
|
||||||
|
if (!res)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(dev), gpios);
|
||||||
|
if (ret) {
|
||||||
|
devres_free(res);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
devres_add(dev, res);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(devm_acpi_dev_add_driver_gpios);
|
||||||
|
|
||||||
|
void devm_acpi_dev_remove_driver_gpios(struct device *dev)
|
||||||
|
{
|
||||||
|
WARN_ON(devres_release(dev, devm_acpi_dev_release_driver_gpios, NULL, NULL));
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(devm_acpi_dev_remove_driver_gpios);
|
||||||
|
|
||||||
static bool acpi_get_driver_gpio_data(struct acpi_device *adev,
|
static bool acpi_get_driver_gpio_data(struct acpi_device *adev,
|
||||||
const char *name, int index,
|
const char *name, int index,
|
||||||
struct acpi_reference_args *args)
|
struct acpi_reference_args *args)
|
||||||
|
|
|
@ -952,6 +952,10 @@ static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev)
|
||||||
adev->driver_gpios = NULL;
|
adev->driver_gpios = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int devm_acpi_dev_add_driver_gpios(struct device *dev,
|
||||||
|
const struct acpi_gpio_mapping *gpios);
|
||||||
|
void devm_acpi_dev_remove_driver_gpios(struct device *dev);
|
||||||
|
|
||||||
int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);
|
int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index);
|
||||||
#else
|
#else
|
||||||
static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,
|
static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,
|
||||||
|
@ -961,6 +965,13 @@ static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,
|
||||||
}
|
}
|
||||||
static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {}
|
static inline void acpi_dev_remove_driver_gpios(struct acpi_device *adev) {}
|
||||||
|
|
||||||
|
static inline int devm_acpi_dev_add_driver_gpios(struct device *dev,
|
||||||
|
const struct acpi_gpio_mapping *gpios)
|
||||||
|
{
|
||||||
|
return -ENXIO;
|
||||||
|
}
|
||||||
|
static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {}
|
||||||
|
|
||||||
static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
|
static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
|
||||||
{
|
{
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
Loading…
Reference in New Issue