Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 749207d9 authored by Gene Chen's avatar Gene Chen Committed by Treehugger Robot
Browse files

UPSTREAM: leds: flash: Fix multicolor no-ops registration by return 0 



Fix multicolor no-ops registration by return 0,
and move the same registration functions outside of #ifdef block.

Signed-off-by: default avatarGene Chen <gene_chen@richtek.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>

Bug: 260685629
(cherry picked from commit 6039b7e87be0b350a5f8fc135adfb5d1f4ba66ad)
Change-Id: Ieb8cace2978f61bd2de5c576e851987c6ba31e2c
Signed-off-by: default avatarFarid Chahla <farid.chahla@sony.com>
parent 3e667a08

include/linux/led-class-multicolor.h

+15 −27
Original line number Diff line number Diff line
@@ -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 */