diff options
Diffstat (limited to 'include/linux/led-class-multicolor.h')
| -rw-r--r-- | include/linux/led-class-multicolor.h | 42 | 
1 files changed, 15 insertions, 27 deletions
diff --git a/include/linux/led-class-multicolor.h b/include/linux/led-class-multicolor.h index 5116f9a866cc..210d57bcd767 100644 --- a/include/linux/led-class-multicolor.h +++ b/include/linux/led-class-multicolor.h @@ -44,12 +44,6 @@ int led_classdev_multicolor_register_ext(struct device *parent,  					    struct led_classdev_mc *mcled_cdev,  					    struct led_init_data *init_data); -static inline int led_classdev_multicolor_register(struct device *parent, -					    struct led_classdev_mc *mcled_cdev) -{ -	return led_classdev_multicolor_register_ext(parent, mcled_cdev, NULL); -} -  /**   * led_classdev_multicolor_unregister - unregisters an object of led_classdev   *					class with support for multicolor LEDs @@ -68,13 +62,6 @@ int devm_led_classdev_multicolor_register_ext(struct device *parent,  					  struct led_classdev_mc *mcled_cdev,  					  struct led_init_data *init_data); -static inline int devm_led_classdev_multicolor_register(struct device *parent, -				     struct led_classdev_mc *mcled_cdev) -{ -	return devm_led_classdev_multicolor_register_ext(parent, mcled_cdev, -							 NULL); -} -  void devm_led_classdev_multicolor_unregister(struct device *parent,  					    struct led_classdev_mc *mcled_cdev);  #else @@ -83,27 +70,33 @@ static inline int led_classdev_multicolor_register_ext(struct device *parent,  					    struct led_classdev_mc *mcled_cdev,  					    struct led_init_data *init_data)  { -	return -EINVAL; -} - -static inline int led_classdev_multicolor_register(struct device *parent, -					    struct led_classdev_mc *mcled_cdev) -{ -	return led_classdev_multicolor_register_ext(parent, mcled_cdev, NULL); +	return 0;  }  static inline void led_classdev_multicolor_unregister(struct led_classdev_mc *mcled_cdev) {};  static inline int led_mc_calc_color_components(struct led_classdev_mc *mcled_cdev,  					       enum led_brightness brightness)  { -	return -EINVAL; +	return 0;  }  static inline int devm_led_classdev_multicolor_register_ext(struct device *parent,  					  struct led_classdev_mc *mcled_cdev,  					  struct led_init_data *init_data)  { -	return -EINVAL; +	return 0; +} + +static inline void devm_led_classdev_multicolor_unregister(struct device *parent, +					    struct led_classdev_mc *mcled_cdev) +{}; + +#endif  /* IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR) */ + +static inline int led_classdev_multicolor_register(struct device *parent, +					    struct led_classdev_mc *mcled_cdev) +{ +	return led_classdev_multicolor_register_ext(parent, mcled_cdev, NULL);  }  static inline int devm_led_classdev_multicolor_register(struct device *parent, @@ -113,9 +106,4 @@ static inline int devm_led_classdev_multicolor_register(struct device *parent,  							 NULL);  } -static inline void devm_led_classdev_multicolor_unregister(struct device *parent, -					    struct led_classdev_mc *mcled_cdev) -{}; - -#endif  /* IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR) */  #endif	/* _LINUX_MULTICOLOR_LEDS_H_INCLUDED */  | 
