From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Pavel Machek <pavel@ucw.cz>, Lee Jones <lee@kernel.org>
Subject: [PATCH v1 3/6] leds: spi-byte: Make use of device properties
Date: Thu, 6 Jun 2024 20:29:20 +0300 [thread overview]
Message-ID: <20240606173037.3091598-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240606173037.3091598-1-andriy.shevchenko@linux.intel.com>
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>
---
drivers/leds/Kconfig | 1 -
drivers/leds/leds-spi-byte.c | 15 +++++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 7211f0a4f88f..2e1925d2068c 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -865,7 +865,6 @@ config LEDS_SPI_BYTE
tristate "LED support for SPI LED controller with a single byte"
depends on LEDS_CLASS
depends on SPI
- depends on OF
help
This option enables support for LED controller which use a single byte
for controlling the brightness. Currently the following controller is
diff --git a/drivers/leds/leds-spi-byte.c b/drivers/leds/leds-spi-byte.c
index 76733946c99a..1fc0a8cc123e 100644
--- a/drivers/leds/leds-spi-byte.c
+++ b/drivers/leds/leds-spi-byte.c
@@ -29,8 +29,9 @@
*/
#include <linux/leds.h>
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
-#include <linux/of.h>
+#include <linux/property.h>
#include <linux/spi/spi.h>
#include <linux/mutex.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)
{
- struct device_node *child;
+ struct fwnode_handle *child __free(fwnode_handle) = NULL;
struct device *dev = &spi->dev;
struct spi_byte_led *led;
struct led_init_data init_data = {};
enum led_default_state state;
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.");
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.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)
led->ldev.brightness = led->ldev.max_brightness;
spi_byte_brightness_set_blocking(&led->ldev,
led->ldev.brightness);
- init_data.fwnode = of_fwnode_handle(child);
+ init_data.fwnode = child;
init_data.devicename = "leds-spi-byte";
init_data.default_label = ":";
ret = devm_led_classdev_register_ext(&spi->dev, &led->ldev, &init_data);
if (ret) {
- of_node_put(child);
mutex_destroy(&led->mutex);
return ret;
}
- of_node_put(child);
spi_set_drvdata(spi, led);
return 0;
--
2.43.0.rc1.1336.g36b5255a03ac
next prev parent reply other threads:[~2024-06-06 17:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 17:29 [PATCH v1 0/6] leds: spi-byte: Cleanup, fix a leak, and make it agnostic Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 1/6] leds: spi-byte: call of_node_put() on error path Andy Shevchenko
2024-06-06 17:54 ` Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 2/6] leds: spi-byte: Get rid of custom led_init_default_state_get() Andy Shevchenko
2024-06-06 17:29 ` Andy Shevchenko [this message]
2024-06-06 17:29 ` [PATCH v1 4/6] leds: spi-byte: Utilise temporary variable for struct device Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 5/6] leds: spi-byte: Use devm_mutex_init() for mutex initialization Andy Shevchenko
2024-06-06 17:29 ` [PATCH v1 6/6] leds: spi-byte: Move OF ID table closer to their user Andy Shevchenko
2024-06-13 16:05 ` [PATCH v1 0/6] leds: spi-byte: Cleanup, fix a leak, and make it agnostic Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240606173037.3091598-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®