Commit e3280b54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'led-fixes-for-5.4-rc3' of... 

Merge tag 'led-fixes-for-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds

Pull LED fixes from Jacek Anaszewski:

 - fix a leftover from earlier stage of development in the documentation
   of recently added led_compose_name() and fix old mistake in the
   documentation of led_set_brightness_sync() parameter name.

  - MAINTAINERS: add pointer to Pavel Machek's linux-leds.git tree.
    Pavel is going to take over LED tree maintainership from myself.

* tag 'led-fixes-for-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
  Add my linux-leds branch to MAINTAINERS
  leds: core: Fix leds.h structure documentation
parents d5001955 4050d21d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9187,6 +9187,7 @@ M: Pavel Machek <pavel@ucw.cz> 
R:	Dan Murphy <dmurphy@ti.com>

L:	linux-leds@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git

S:	Maintained

F:	Documentation/devicetree/bindings/leds/

F:	drivers/leds/

include/linux/leds.h

+2 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ extern void led_set_brightness(struct led_classdev *led_cdev, 
/**

 * led_set_brightness_sync - set LED brightness synchronously

 * @led_cdev: the LED to set

 * @brightness: the brightness to set it to

 * @value: the brightness to set it to

 *

 * Set an LED's brightness immediately. This function will block

 * the caller for the time required for accessing device registers,
@@ -301,8 +301,7 @@ extern void led_sysfs_enable(struct led_classdev *led_cdev); 
/**

 * led_compose_name - compose LED class device name

 * @dev: LED controller device object

 * @child: child fwnode_handle describing a LED or a group of synchronized LEDs;

 *	   it must be provided only for fwnode based LEDs

 * @init_data: the LED class device initialization data

 * @led_classdev_name: composed LED class device name

 *

 * Create LED class device name basing on the provided init_data argument.

CRA Git | Maintained and supported by SUSTech CRA and CCSE