1

leds: spi-byte: Make use of device properties

Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Add mod_devicetable.h include.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240606173037.3091598-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Andy Shevchenko 2024-06-06 20:29:20 +03:00 committed by Lee Jones
parent 4b268456e0
commit 67b66160bd
2 changed files with 7 additions and 9 deletions

View File

@ -884,7 +884,6 @@ config LEDS_SPI_BYTE
tristate "LED support for SPI LED controller with a single byte" tristate "LED support for SPI LED controller with a single byte"
depends on LEDS_CLASS depends on LEDS_CLASS
depends on SPI depends on SPI
depends on OF
help help
This option enables support for LED controller which use a single byte This option enables support for LED controller which use a single byte
for controlling the brightness. Currently the following controller is for controlling the brightness. Currently the following controller is

View File

@ -29,8 +29,9 @@
*/ */
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/property.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <uapi/linux/uleds.h> #include <uapi/linux/uleds.h>
@ -80,14 +81,14 @@ static int spi_byte_brightness_set_blocking(struct led_classdev *dev,
static int spi_byte_probe(struct spi_device *spi) static int spi_byte_probe(struct spi_device *spi)
{ {
struct device_node *child; struct fwnode_handle *child __free(fwnode_handle) = NULL;
struct device *dev = &spi->dev; struct device *dev = &spi->dev;
struct spi_byte_led *led; struct spi_byte_led *led;
struct led_init_data init_data = {}; struct led_init_data init_data = {};
enum led_default_state state; enum led_default_state state;
int ret; int ret;
if (of_get_available_child_count(dev_of_node(dev)) != 1) { if (device_get_child_node_count(dev) != 1) {
dev_err(dev, "Device must have exactly one LED sub-node."); dev_err(dev, "Device must have exactly one LED sub-node.");
return -EINVAL; return -EINVAL;
} }
@ -103,26 +104,24 @@ static int spi_byte_probe(struct spi_device *spi)
led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value; led->ldev.max_brightness = led->cdef->max_value - led->cdef->off_value;
led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking; led->ldev.brightness_set_blocking = spi_byte_brightness_set_blocking;
child = of_get_next_available_child(dev_of_node(dev), NULL); child = device_get_next_child_node(dev, NULL);
state = led_init_default_state_get(of_fwnode_handle(child)); state = led_init_default_state_get(child);
if (state == LEDS_DEFSTATE_ON) if (state == LEDS_DEFSTATE_ON)
led->ldev.brightness = led->ldev.max_brightness; led->ldev.brightness = led->ldev.max_brightness;
spi_byte_brightness_set_blocking(&led->ldev, spi_byte_brightness_set_blocking(&led->ldev,
led->ldev.brightness); led->ldev.brightness);
init_data.fwnode = of_fwnode_handle(child); init_data.fwnode = child;
init_data.devicename = "leds-spi-byte"; init_data.devicename = "leds-spi-byte";
init_data.default_label = ":"; init_data.default_label = ":";
ret = devm_led_classdev_register_ext(&spi->dev, &led->ldev, &init_data); ret = devm_led_classdev_register_ext(&spi->dev, &led->ldev, &init_data);
if (ret) { if (ret) {
of_node_put(child);
mutex_destroy(&led->mutex); mutex_destroy(&led->mutex);
return ret; return ret;
} }
of_node_put(child);
spi_set_drvdata(spi, led); spi_set_drvdata(spi, led);
return 0; return 0;