|
@@ -142,6 +142,10 @@ extern void led_set_brightness(struct led_classdev *led_cdev,
|
|
|
/*
|
|
|
* LED Triggers
|
|
|
*/
|
|
|
+/* Registration functions for simple triggers */
|
|
|
+#define DEFINE_LED_TRIGGER(x) static struct led_trigger *x;
|
|
|
+#define DEFINE_LED_TRIGGER_GLOBAL(x) struct led_trigger *x;
|
|
|
+
|
|
|
#ifdef CONFIG_LEDS_TRIGGERS
|
|
|
|
|
|
#define TRIG_NAME_MAX 50
|
|
@@ -164,9 +168,6 @@ struct led_trigger {
|
|
|
extern int led_trigger_register(struct led_trigger *trigger);
|
|
|
extern void led_trigger_unregister(struct led_trigger *trigger);
|
|
|
|
|
|
-/* Registration functions for simple triggers */
|
|
|
-#define DEFINE_LED_TRIGGER(x) static struct led_trigger *x;
|
|
|
-#define DEFINE_LED_TRIGGER_GLOBAL(x) struct led_trigger *x;
|
|
|
extern void led_trigger_register_simple(const char *name,
|
|
|
struct led_trigger **trigger);
|
|
|
extern void led_trigger_unregister_simple(struct led_trigger *trigger);
|
|
@@ -199,20 +200,22 @@ extern void led_trigger_rename_static(const char *name,
|
|
|
|
|
|
#else
|
|
|
|
|
|
-/* Triggers aren't active - null macros */
|
|
|
-#define DEFINE_LED_TRIGGER(x)
|
|
|
-#define DEFINE_LED_TRIGGER_GLOBAL(x)
|
|
|
-#define led_trigger_register_simple(x, y) do {} while(0)
|
|
|
-#define led_trigger_unregister_simple(x) do {} while(0)
|
|
|
-#define led_trigger_event(x, y) do {} while(0)
|
|
|
+/* Trigger has no members */
|
|
|
+struct led_trigger {};
|
|
|
|
|
|
-#endif
|
|
|
+/* Trigger inline empty functions */
|
|
|
+static inline void led_trigger_register_simple(const char *name,
|
|
|
+ struct led_trigger **trigger) {}
|
|
|
+static inline void led_trigger_unregister_simple(struct led_trigger *trigger) {}
|
|
|
+static inline void led_trigger_event(struct led_trigger *trigger,
|
|
|
+ enum led_brightness event) {}
|
|
|
+#endif /* CONFIG_LEDS_TRIGGERS */
|
|
|
|
|
|
/* Trigger specific functions */
|
|
|
#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
|
|
|
extern void ledtrig_ide_activity(void);
|
|
|
#else
|
|
|
-#define ledtrig_ide_activity() do {} while(0)
|
|
|
+static inline void ledtrig_ide_activity(void) {}
|
|
|
#endif
|
|
|
|
|
|
/*
|