From: Jacek Anaszewski <j.anaszewski@samsung.com>
To: linux-leds@vger.kernel.org, linux-media@vger.kernel.org
Cc: devicetree@vger.kernel.org, kyungmin.park@samsung.com,
pavel@ucw.cz, cooloney@gmail.com, rpurdie@rpsys.net,
sakari.ailus@iki.fi, s.nawrocki@samsung.com,
Jacek Anaszewski <j.anaszewski@samsung.com>
Subject: [PATCH v2 01/11] leds: unify the location of led-trigger API
Date: Fri, 27 Mar 2015 14:49:35 +0100 [thread overview]
Message-ID: <1427464185-27950-2-git-send-email-j.anaszewski@samsung.com> (raw)
In-Reply-To: <1427464185-27950-1-git-send-email-j.anaszewski@samsung.com>
Part of led-trigger API was in the private drivers/leds/leds.h header.
Move it to the include/linux/leds.h header to unify the API location
and announce it as public. It has been already exported from
led-triggers.c with EXPORT_SYMBOL_GPL macro.
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
---
drivers/leds/leds.h | 24 ------------------------
include/linux/leds.h | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h
index 79efe57..bc89d7a 100644
--- a/drivers/leds/leds.h
+++ b/drivers/leds/leds.h
@@ -13,7 +13,6 @@
#ifndef __LEDS_H_INCLUDED
#define __LEDS_H_INCLUDED
-#include <linux/device.h>
#include <linux/rwsem.h>
#include <linux/leds.h>
@@ -50,27 +49,4 @@ void led_stop_software_blink(struct led_classdev *led_cdev);
extern struct rw_semaphore leds_list_lock;
extern struct list_head leds_list;
-#ifdef CONFIG_LEDS_TRIGGERS
-void led_trigger_set_default(struct led_classdev *led_cdev);
-void led_trigger_set(struct led_classdev *led_cdev,
- struct led_trigger *trigger);
-void led_trigger_remove(struct led_classdev *led_cdev);
-
-static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
-{
- return led_cdev->trigger_data;
-}
-
-#else
-#define led_trigger_set_default(x) do {} while (0)
-#define led_trigger_set(x, y) do {} while (0)
-#define led_trigger_remove(x) do {} while (0)
-#define led_get_trigger_data(x) (NULL)
-#endif
-
-ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
- const char *buf, size_t count);
-ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
- char *buf);
-
#endif /* __LEDS_H_INCLUDED */
diff --git a/include/linux/leds.h b/include/linux/leds.h
index 9a2b000..0579708 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -12,6 +12,7 @@
#ifndef __LINUX_LEDS_H_INCLUDED
#define __LINUX_LEDS_H_INCLUDED
+#include <linux/device.h>
#include <linux/list.h>
#include <linux/mutex.h>
#include <linux/rwsem.h>
@@ -222,6 +223,29 @@ struct led_trigger {
struct list_head next_trig;
};
+#ifdef CONFIG_LEDS_TRIGGERS
+void led_trigger_set_default(struct led_classdev *led_cdev);
+void led_trigger_set(struct led_classdev *led_cdev,
+ struct led_trigger *trigger);
+void led_trigger_remove(struct led_classdev *led_cdev);
+
+static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
+{
+ return led_cdev->trigger_data;
+}
+
+#else
+#define led_trigger_set_default(x) do {} while (0)
+#define led_trigger_set(x, y) do {} while (0)
+#define led_trigger_remove(x) do {} while (0)
+#define led_get_trigger_data(x) (NULL)
+#endif
+
+ssize_t led_trigger_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count);
+ssize_t led_trigger_show(struct device *dev, struct device_attribute *attr,
+ char *buf);
+
/* Registration functions for complex triggers */
extern int led_trigger_register(struct led_trigger *trigger);
extern void led_trigger_unregister(struct led_trigger *trigger);
--
1.7.9.5
next prev parent reply other threads:[~2015-03-27 13:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-27 13:49 [PATCH v2 00/11] LED / flash API integration Jacek Anaszewski
2015-03-27 13:49 ` Jacek Anaszewski [this message]
2015-03-28 22:33 ` [PATCH v2 01/11] leds: unify the location of led-trigger API Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 02/11] leds: add uapi header file Jacek Anaszewski
[not found] ` <1427464185-27950-3-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-28 22:35 ` Sakari Ailus
2015-03-30 7:22 ` Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 03/11] leds: Add support for max77693 mfd flash cell Jacek Anaszewski
2015-03-28 22:45 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 04/11] DT: Add documentation for the mfd Maxim max77693 Jacek Anaszewski
2015-03-27 14:06 ` Jacek Anaszewski
2015-03-28 22:55 ` Sakari Ailus
2015-03-30 7:36 ` Jacek Anaszewski
[not found] ` <5518FD05.5060800-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-30 9:35 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 05/11] leds: Add driver for AAT1290 flash LED controller Jacek Anaszewski
2015-03-28 22:57 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 06/11] of: Add Skyworks Solutions, Inc. vendor prefix Jacek Anaszewski
[not found] ` <1427464185-27950-1-git-send-email-j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-03-27 13:49 ` [PATCH v2 07/11] DT: Add documentation for the Skyworks AAT1290 Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 08/11] media: Add registration helpers for V4L2 flash sub-devices Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 09/11] Documentation: leds: Add description of v4l2-flash sub-device Jacek Anaszewski
2015-03-28 23:35 ` Sakari Ailus
2015-03-27 13:49 ` [PATCH v2 10/11] leds: max77693: add support for V4L2 Flash sub-device Jacek Anaszewski
2015-03-27 13:49 ` [PATCH v2 11/11] leds: aat1290: " Jacek Anaszewski
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=1427464185-27950-2-git-send-email-j.anaszewski@samsung.com \
--to=j.anaszewski@samsung.com \
--cc=cooloney@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-leds@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rpurdie@rpsys.net \
--cc=s.nawrocki@samsung.com \
--cc=sakari.ailus@iki.fi \
/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;
as well as URLs for NNTP newsgroup(s).