| Message ID | 20230131140304.626779-2-clabbe@baylibre.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v5,1/2] dt-bindings: leds: common: add disk write/read and usb-host/usb-gadget | expand |
On Tue, 31 Jan 2023, Corentin Labbe wrote: > No user of ide-disk remains, so remove this deprecated trigger. > Only a few platforms used this and were fixed in 2016. > > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Corentin Labbe <clabbe@baylibre.com> > --- > Change since v1: > - remove also DEFINE_LED_TRIGGER(ledtrig_ide) > Changes since v2: > - Added the fact that few platforms used this and it was fixed old ago. > - Added Rob's ack > > Change since v3: > - Rebase on top of latest next > Change since v4: > - Rebase on top of latest next > > Documentation/devicetree/bindings/leds/common.yaml | 3 --- > drivers/leds/trigger/ledtrig-disk.c | 4 ---- > 2 files changed, 7 deletions(-) Applied, thanks
diff --git a/Documentation/devicetree/bindings/leds/common.yaml b/Documentation/devicetree/bindings/leds/common.yaml index 60c8611c6611..15e3f6645682 100644 --- a/Documentation/devicetree/bindings/leds/common.yaml +++ b/Documentation/devicetree/bindings/leds/common.yaml @@ -92,9 +92,6 @@ properties: - disk-activity - disk-read - disk-write - # LED indicates IDE disk activity (deprecated), in new implementations - # use "disk-activity" - - ide-disk # LED flashes at a fixed, configurable rate - timer # LED alters the brightness for the specified duration with one software diff --git a/drivers/leds/trigger/ledtrig-disk.c b/drivers/leds/trigger/ledtrig-disk.c index 0741910785bb..0b7dfbd04273 100644 --- a/drivers/leds/trigger/ledtrig-disk.c +++ b/drivers/leds/trigger/ledtrig-disk.c @@ -16,7 +16,6 @@ DEFINE_LED_TRIGGER(ledtrig_disk); DEFINE_LED_TRIGGER(ledtrig_disk_read); DEFINE_LED_TRIGGER(ledtrig_disk_write); -DEFINE_LED_TRIGGER(ledtrig_ide); void ledtrig_disk_activity(bool write) { @@ -24,8 +23,6 @@ void ledtrig_disk_activity(bool write) led_trigger_blink_oneshot(ledtrig_disk, &blink_delay, &blink_delay, 0); - led_trigger_blink_oneshot(ledtrig_ide, - &blink_delay, &blink_delay, 0); if (write) led_trigger_blink_oneshot(ledtrig_disk_write, &blink_delay, &blink_delay, 0); @@ -40,7 +37,6 @@ static int __init ledtrig_disk_init(void) led_trigger_register_simple("disk-activity", &ledtrig_disk); led_trigger_register_simple("disk-read", &ledtrig_disk_read); led_trigger_register_simple("disk-write", &ledtrig_disk_write); - led_trigger_register_simple("ide-disk", &ledtrig_ide); return 0; }