From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcFTIgM (ORCPT ); Mon, 20 Jun 2016 04:36:12 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:63772 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751961AbcFTIgF (ORCPT ); Mon, 20 Jun 2016 04:36:05 -0400 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8; format=flowed X-AuditID: cbfec7f5-f792a6d000001302-f4-5767aaf1db5e Content-transfer-encoding: 8BIT Message-id: <5767AAF0.7080608@samsung.com> Date: Mon, 20 Jun 2016 10:36:00 +0200 From: Jacek Anaszewski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130804 Thunderbird/17.0.8 To: Stephan Linz Cc: linux-leds@vger.kernel.org, linux-ide@vger.kernel.org, Joseph Jezak , Nico Macrionitis , =?UTF-8?B?SsO2cmcgU29tbWVy?= , Richard Purdie , Tejun Heo , "David S. Miller" , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger References: <20160608223000.433-1-linz@li-pro.net> In-reply-to: <20160608223000.433-1-linz@li-pro.net> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t/xK7ofV6WHGxw4wm2xd8FXJos551tY LM4va2e1OPegh9ni2I5HTBaXd81hs9j6Zh2jxdXXi1gsdu96ymrxa/lRRgcujyXNm5k87mxZ x+qxZeVNJo/L398we2xa1cnmsfttqsee+T9YPT5vkgvgiOKySUnNySxLLdK3S+DK+LfgKmPB BbOKpy3tTA2Mi3S6GDk5JARMJI5s2MgEYYtJXLi3nq2LkYtDSGApo8TWOV9ZQBK8AoISPybf A7I5OJgF5CWOXMoGCTMLmEk8alnHDFH/jFHi0cFVzBD1WhILrp9jBbFZBFQlrkzeBTaHTcBQ 4ueL12DLRAUiJP6c3gdWIyKgJDHpSSs7yCBmgUNMEtcn/2UESQgL+Ejs+XsYrEhIwEji9Nt9 bCA2p4CxxPJlK9kmMArMQnLfLIT7ZiG5bwEj8ypG0dTS5ILipPRcI73ixNzi0rx0veT83E2M kPj4uoNx6TGrQ4wCHIxKPLwWZ9PChVgTy4orcw8xSnAwK4nwGi1LDxfiTUmsrEotyo8vKs1J LT7EKM3BoiTOO3PX+xAhgfTEktTs1NSC1CKYLBMHp1QDI5PLXd0E0ffTLUIVv7oVGUfOYJYo NbGKbOF3+f7BX1uhq2G5b02RR+LuhZneT9baZOZO1XFsSltqET1jocJpzT1THvP1vK1UvrAm 6P+R1gOeHOFdl7KDu5Z2ruHVvqQ0eevcFPelXVPN5XJDLRLXXWp8zD5/bYh7Pfu+9LSLR/z/ Vu46sGOeEktxRqKhFnNRcSIAdISfj4sCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephan, On 06/09/2016 12:29 AM, Stephan Linz wrote: > This patch converts the IDE specific LED trigger to a generic disk > activity LED trigger. The libata core is now a trigger source just > like before the IDE disk driver. It's merely a replacement of the > string ide by disk. > > The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is > widely used by any ibook/powerbook owners with great satisfaction. > Likewise, it is very often used successfully on different ARM platforms. > > The original patch was split into different parts to clarify platform > independent and dependent changes. > > Cc: Joseph Jezak > Cc: Nico Macrionitis > Cc: Jörg Sommer > Cc: Richard Purdie > Cc: Jacek Anaszewski > Signed-off-by: Stephan Linz > --- > Changes in v3: > - Port to kernel 4.x > - Split into platform independent and dependent parts. > > v2: https://patchwork.ozlabs.org/patch/117485/ > v1: http://dev.gentoo.org/~josejx/ata.patch > --- > drivers/ata/libata-core.c | 4 ++++ > drivers/ide/ide-disk.c | 2 +- > drivers/leds/leds-hp6xx.c | 2 +- > drivers/leds/trigger/Kconfig | 8 ++++---- > drivers/leds/trigger/Makefile | 2 +- > .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} | 20 ++++++++++---------- > include/linux/leds.h | 6 +++--- > 7 files changed, 24 insertions(+), 20 deletions(-) > rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} (50%) > > diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c > index 6be7770..2eca572 100644 > --- a/drivers/ata/libata-core.c > +++ b/drivers/ata/libata-core.c > @@ -69,6 +69,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc) > { > struct ata_port *ap = qc->ap; > > + /* Trigger the LED (if available) */ > + ledtrig_disk_activity(); > + > /* XXX: New EH and old EH use different mechanisms to > * synchronize EH with regular execution path. > * > diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c > index 05dbcce..5ceb176 100644 > --- a/drivers/ide/ide-disk.c > +++ b/drivers/ide/ide-disk.c > @@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq, > BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED); > BUG_ON(rq->cmd_type != REQ_TYPE_FS); > > - ledtrig_ide_activity(); > + ledtrig_disk_activity(); > > pr_debug("%s: %sing: block=%llu, sectors=%u\n", > drive->name, rq_data_dir(rq) == READ ? "read" : "writ", > diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c > index a6b8db0..137969f 100644 > --- a/drivers/leds/leds-hp6xx.c > +++ b/drivers/leds/leds-hp6xx.c > @@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = { > > static struct led_classdev hp6xx_green_led = { > .name = "hp6xx:green", > - .default_trigger = "ide-disk", > + .default_trigger = "disk-activity", > .brightness_set = hp6xxled_green_set, > .flags = LED_CORE_SUSPENDRESUME, > }; > diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig > index 9893d91..3f9ddb9 100644 > --- a/drivers/leds/trigger/Kconfig > +++ b/drivers/leds/trigger/Kconfig > @@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT > > If unsure, say Y. > > -config LEDS_TRIGGER_IDE_DISK > - bool "LED IDE Disk Trigger" > - depends on IDE_GD_ATA > +config LEDS_TRIGGER_DISK > + bool "LED Disk Trigger" > + depends on IDE_GD_ATA || ATA > depends on LEDS_TRIGGERS > help > - This allows LEDs to be controlled by IDE disk activity. > + This allows LEDs to be controlled by disk activity. > If unsure, say Y. > > config LEDS_TRIGGER_MTD > diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile > index 8cc64a4..a72c43c 100644 > --- a/drivers/leds/trigger/Makefile > +++ b/drivers/leds/trigger/Makefile > @@ -1,6 +1,6 @@ > obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o > obj-$(CONFIG_LEDS_TRIGGER_ONESHOT) += ledtrig-oneshot.o > -obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o > +obj-$(CONFIG_LEDS_TRIGGER_DISK) += ledtrig-disk.o > obj-$(CONFIG_LEDS_TRIGGER_MTD) += ledtrig-mtd.o > obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o > obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o > diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-disk.c > similarity index 50% > rename from drivers/leds/trigger/ledtrig-ide-disk.c > rename to drivers/leds/trigger/ledtrig-disk.c > index 15123d3..7a1fe44 100644 > --- a/drivers/leds/trigger/ledtrig-ide-disk.c > +++ b/drivers/leds/trigger/ledtrig-disk.c > @@ -1,5 +1,5 @@ > /* > - * LED IDE-Disk Activity Trigger > + * LED Disk Activity Trigger > * > * Copyright 2006 Openedhand Ltd. > * > @@ -17,20 +17,20 @@ > > #define BLINK_DELAY 30 > > -DEFINE_LED_TRIGGER(ledtrig_ide); > +DEFINE_LED_TRIGGER(ledtrig_disk); > > -void ledtrig_ide_activity(void) > +void ledtrig_disk_activity(void) > { > - unsigned long ide_blink_delay = BLINK_DELAY; > + unsigned long disk_blink_delay = BLINK_DELAY; > > - led_trigger_blink_oneshot(ledtrig_ide, > - &ide_blink_delay, &ide_blink_delay, 0); > + led_trigger_blink_oneshot(ledtrig_disk, > + &disk_blink_delay, &disk_blink_delay, 0); > } > -EXPORT_SYMBOL(ledtrig_ide_activity); > +EXPORT_SYMBOL(ledtrig_disk_activity); > > -static int __init ledtrig_ide_init(void) > +static int __init ledtrig_disk_init(void) > { > - led_trigger_register_simple("ide-disk", &ledtrig_ide); > + led_trigger_register_simple("disk-activity", &ledtrig_disk); > return 0; > } > -device_initcall(ledtrig_ide_init); > +device_initcall(ledtrig_disk_init); > diff --git a/include/linux/leds.h b/include/linux/leds.h > index d2b1306..28a3ef5 100644 > --- a/include/linux/leds.h > +++ b/include/linux/leds.h > @@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev) > #endif /* CONFIG_LEDS_TRIGGERS */ > > /* Trigger specific functions */ > -#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK > -extern void ledtrig_ide_activity(void); > +#ifdef CONFIG_LEDS_TRIGGER_DISK > +extern void ledtrig_disk_activity(void); > #else > -static inline void ledtrig_ide_activity(void) {} > +static inline void ledtrig_disk_activity(void) {} > #endif > > #ifdef CONFIG_LEDS_TRIGGER_MTD > Applied the patchset to the for-next branch of linux-leds.git. Thanks, Jacek Anaszewski