lkml.org 
[lkml]   [2020]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 1/5] leds: flash: Add flash registration with undefined CONFIG_LEDS_CLASS_FLASH
    Date
    From: Gene Chen <gene_chen@richtek.com>

    Add flash registration with undefined CONFIG_LEDS_CLASS_FLASH,
    and move the same registration functions outside of #ifdef block.

    Signed-off-by: Gene Chen <gene_chen@richtek.com>
    Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
    ---
    include/linux/led-class-flash.h | 42 ++++++++++++++++++++++++++++++++---------
    1 file changed, 33 insertions(+), 9 deletions(-)

    diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h
    index 21a3358..612b4ca 100644
    --- a/include/linux/led-class-flash.h
    +++ b/include/linux/led-class-flash.h
    @@ -85,6 +85,7 @@ static inline struct led_classdev_flash *lcdev_to_flcdev(
    return container_of(lcdev, struct led_classdev_flash, led_cdev);
    }

    +#if IS_ENABLED(CONFIG_LEDS_CLASS_FLASH)
    /**
    * led_classdev_flash_register_ext - register a new object of LED class with
    * init data and with support for flash LEDs
    @@ -98,12 +99,6 @@ int led_classdev_flash_register_ext(struct device *parent,
    struct led_classdev_flash *fled_cdev,
    struct led_init_data *init_data);

    -static inline int led_classdev_flash_register(struct device *parent,
    - struct led_classdev_flash *fled_cdev)
    -{
    - return led_classdev_flash_register_ext(parent, fled_cdev, NULL);
    -}
    -
    /**
    * led_classdev_flash_unregister - unregisters an object of led_classdev class
    * with support for flash LEDs
    @@ -118,15 +113,44 @@ int devm_led_classdev_flash_register_ext(struct device *parent,
    struct led_init_data *init_data);


    +void devm_led_classdev_flash_unregister(struct device *parent,
    + struct led_classdev_flash *fled_cdev);
    +
    +#else
    +
    +static inline int led_classdev_flash_register_ext(struct device *parent,
    + struct led_classdev_flash *fled_cdev,
    + struct led_init_data *init_data)
    +{
    + return 0;
    +}
    +
    +static inline void led_classdev_flash_unregister(struct led_classdev_flash *fled_cdev) {};
    +static inline int devm_led_classdev_flash_register_ext(struct device *parent,
    + struct led_classdev_flash *fled_cdev,
    + struct led_init_data *init_data)
    +{
    + return 0;
    +}
    +
    +static inline void devm_led_classdev_flash_unregister(struct device *parent,
    + struct led_classdev_flash *fled_cdev)
    +{};
    +
    +#endif /* IS_ENABLED(CONFIG_LEDS_CLASS_FLASH) */
    +
    +static inline int led_classdev_flash_register(struct device *parent,
    + struct led_classdev_flash *fled_cdev)
    +{
    + return led_classdev_flash_register_ext(parent, fled_cdev, NULL);
    +}
    +
    static inline int devm_led_classdev_flash_register(struct device *parent,
    struct led_classdev_flash *fled_cdev)
    {
    return devm_led_classdev_flash_register_ext(parent, fled_cdev, NULL);
    }

    -void devm_led_classdev_flash_unregister(struct device *parent,
    - struct led_classdev_flash *fled_cdev);
    -
    /**
    * led_set_flash_strobe - setup flash strobe
    * @fled_cdev: the flash LED to set strobe on
    --
    2.7.4
    \
     
     \ /
      Last update: 2020-12-02 11:50    [W:2.837 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site