Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964951AbbHKJjN (ORCPT ); Tue, 11 Aug 2015 05:39:13 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:41711 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964908AbbHKJjD (ORCPT ); Tue, 11 Aug 2015 05:39:03 -0400 X-AuditID: cbfee61b-f79706d000001b96-23-55c9c2b5f2f3 From: Jacek Anaszewski To: linux-leds@vger.kernel.org Cc: linux-kernel@vger.kernel.org, cooloney@gmail.com, rpurdie@rpsys.net, stsp@users.sourceforge.net, Andrew Lunn , Michael Hennerich , Jacek Anaszewski Subject: [PATCH/RFC v5 14/57] leds: adp5520: Remove work queue Date: Tue, 11 Aug 2015 11:37:27 +0200 Message-id: <1439285890-27329-15-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1439285890-27329-1-git-send-email-j.anaszewski@samsung.com> References: <1439285890-27329-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrELMWRmVeSWpSXmKPExsVy+t9jQd2th06GGqzaJWFx/u4hZoujOycy WfRefc5ocXnXHDaLrW/WMVpMOLyZ3WL3rqesFp1901gcODxeXXX02DnrLrvHzh2fmTz2zP/B 6tG3ZRWjR9OpdlaPz5vkAtijuGxSUnMyy1KL9O0SuDIaDk1hKlggVjH9/3+2Bsb5Ql2MnBwS AiYSqy82M0LYYhIX7q1n62Lk4hASmMUosXP/UijnJ6PEzZ372UGq2AQMJX6+eM3UxcjBISIg J7HzTCVIDbPAM0aJ/5uaGEHiwgJ2Ep/3JICUswioSnzcu5UdJMwr4ClxcnIkiCkhoCAxZ5IN SAUnUPT680VgJwgJeEgcn93ENoGRdwEjwypGidSC5ILipPRco7zUcr3ixNzi0rx0veT83E2M 4JB7Jr2D8fAu90OMAhyMSjxA80+GCrEmlhVX5h5ilOBgVhLhLZwKFOJNSaysSi3Kjy8qzUkt PsQozcGiJM6rb7IpVEggPbEkNTs1tSC1CCbLxMEp1cC44XCFqmLyyqRtMh18h3y/fQypu1Te utBy5XUjmY+Zd27+331ceuVRffFJNnPDPvSt1N7efl+4ZgffHVOhrRrff5ms31mz0YTtikpH yJ+p3ZsUWK41Hp1+4dP/3YV/lB/N3rZz4bnKp11Tjt//w3vCLfLRioS2mXJ5NYe27FeoWPLP 367SKbr7jBJLcUaioRZzUXEiAMA1FLw1AgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3000 Lines: 98 From: Andrew Lunn Now the core implements the work queue, remove it from the driver. Signed-off-by: Andrew Lunn Cc: Michael Hennerich Signed-off-by: Jacek Anaszewski --- drivers/leds/leds-adp5520.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c index 07e66ca..d09f742 100644 --- a/drivers/leds/leds-adp5520.c +++ b/drivers/leds/leds-adp5520.c @@ -17,34 +17,24 @@ #include #include #include -#include #include #include struct adp5520_led { struct led_classdev cdev; - struct work_struct work; struct device *master; - enum led_brightness new_brightness; int id; int flags; }; -static void adp5520_led_work(struct work_struct *work) -{ - struct adp5520_led *led = container_of(work, struct adp5520_led, work); - adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1, - led->new_brightness >> 2); -} - static void adp5520_led_set(struct led_classdev *led_cdev, enum led_brightness value) { struct adp5520_led *led; led = container_of(led_cdev, struct adp5520_led, cdev); - led->new_brightness = value; - schedule_work(&led->work); + adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1, + value >> 2); } static int adp5520_led_setup(struct adp5520_led *led) @@ -137,6 +127,7 @@ static int adp5520_led_probe(struct platform_device *pdev) led_dat->cdev.default_trigger = cur_led->default_trigger; led_dat->cdev.brightness_set = adp5520_led_set; led_dat->cdev.brightness = LED_OFF; + led_dat->cdev.flags |= LED_BRIGHTNESS_BLOCKING; if (cur_led->flags & ADP5520_FLAG_LED_MASK) led_dat->flags = cur_led->flags; @@ -146,9 +137,6 @@ static int adp5520_led_probe(struct platform_device *pdev) led_dat->id = led_dat->flags & ADP5520_FLAG_LED_MASK; led_dat->master = pdev->dev.parent; - led_dat->new_brightness = LED_OFF; - - INIT_WORK(&led_dat->work, adp5520_led_work); ret = led_classdev_register(led_dat->master, &led_dat->cdev); if (ret) { @@ -170,10 +158,8 @@ static int adp5520_led_probe(struct platform_device *pdev) err: if (i > 0) { - for (i = i - 1; i >= 0; i--) { + for (i = i - 1; i >= 0; i--) led_classdev_unregister(&led[i].cdev); - cancel_work_sync(&led[i].work); - } } return ret; @@ -192,7 +178,6 @@ static int adp5520_led_remove(struct platform_device *pdev) for (i = 0; i < pdata->num_leds; i++) { led_classdev_unregister(&led[i].cdev); - cancel_work_sync(&led[i].work); } return 0; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/