From patchwork Mon Feb 29 20:34:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 8457981 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0A8DE9F52D for ; Mon, 29 Feb 2016 20:38:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A9B02021A for ; Mon, 29 Feb 2016 20:38:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 102E320173 for ; Mon, 29 Feb 2016 20:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720AbcB2Uiv (ORCPT ); Mon, 29 Feb 2016 15:38:51 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35582 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750729AbcB2Uiu (ORCPT ); Mon, 29 Feb 2016 15:38:50 -0500 Received: by mail-wm0-f68.google.com with SMTP id 1so737875wmg.2; Mon, 29 Feb 2016 12:38:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=h4o26AOPBIu8ZVD+F3c6z76moNMUVKBS94ECFW4/mVY=; b=AAqWUVfWG9BzTLDT6g4keJDs/J/Tk1SHuFG8Iwd9ahBfwaO1VLU1gYQRa5h7ANlMyL ceBO+eE9Ew44EO5EVbAaOSWsT8bYJQdzB5+H8axnawhEl6GZVapTCPemhR9kDXxKXtrX zoNkhPw+XOD2k+9vOhhfd4PFBRv0g5bKxq8vz0eWJXMMgH4tShm9Qtd0cB1VPhnCdqe4 VH+/oujvSBwI0bfkvhIU7wwHUz7TFMPacgKwMOO+NZutZGwhI9pHNOf2+L8SRnJUcqVk 8cfG5KFTyQxHXf+FGHioXSnfke5gKAf1e/ZaVNJiL3pk7R6zcZHB/I/ZxsMcJsMMO28r jyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=h4o26AOPBIu8ZVD+F3c6z76moNMUVKBS94ECFW4/mVY=; b=dUcnLK17E54l+xyZa1B76yjx3N1TRJM+uioia0Sb2Urjkb8FnBv69xQTRAdDN+TIoS wMVPAUy04+g9azDkWbmoH6b7Mf004imi6U+0G+mVEMVg++jsCmT/PVHsjXbYbtcmYTVb FNc/kn98/FYxQV/Qs5ENbNdFKnRc/DDe+tOFb6ZkV5ekvFYbelxgVeyH9Y5AHM2u3Pow apMm5vQu3Eob9vzZdv2Bh8omX2DK87dTW8QHORS4c69JD6Jfn15UI801g6ZliBevqp5m OwrVTdfNfkzyts9W/j50YJZHmjVC63yxAoNoJx6apKabuXXziRthhHFe8K03joBENA8L 6dpA== X-Gm-Message-State: AD7BkJJdC8uE+gfV2Q0WecyCDNgDW7ezPnm+vM1+PpKcyuPWge3+yJe4iekrYbRoGw49rw== X-Received: by 10.28.96.197 with SMTP id u188mr8746675wmb.102.1456778328688; Mon, 29 Feb 2016 12:38:48 -0800 (PST) Received: from ?IPv6:2003:62:5f55:ba00:d868:2516:4122:61c1? (p200300625F55BA00D8682516412261C1.dip0.t-ipconnect.de. [2003:62:5f55:ba00:d868:2516:4122:61c1]) by smtp.googlemail.com with ESMTPSA id l7sm27604997wjx.14.2016.02.29.12.38.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Feb 2016 12:38:47 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 1/3] hid: thingm: remove workqueue To: Jiri Kosina Cc: Jacek Anaszewski , Benjamin Tissoires , linux-leds@vger.kernel.org, linux-input@vger.kernel.org Message-ID: <56D4AB6A.3070100@gmail.com> Date: Mon, 29 Feb 2016 21:34:50 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Defining workqueues in LED drivers isn't needed any longer as the LED core was extended with a generic workqueue recently. Signed-off-by: Heiner Kallweit --- drivers/hid/hid-thingm.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/drivers/hid/hid-thingm.c b/drivers/hid/hid-thingm.c index b95d397..69a6ada 100644 --- a/drivers/hid/hid-thingm.c +++ b/drivers/hid/hid-thingm.c @@ -14,7 +14,6 @@ #include #include #include -#include #include "hid-ids.h" @@ -56,7 +55,6 @@ struct thingm_rgb { struct thingm_led red; struct thingm_led green; struct thingm_led blue; - struct work_struct work; u8 num; }; @@ -131,25 +129,21 @@ static int thingm_write_color(struct thingm_rgb *rgb) return thingm_send(rgb->tdev, buf); } -static void thingm_work(struct work_struct *work) +static int thingm_led_set(struct led_classdev *ldev, + enum led_brightness brightness) { - struct thingm_rgb *rgb = container_of(work, struct thingm_rgb, work); + struct thingm_led *led = container_of(ldev, struct thingm_led, ldev); + int ret; - mutex_lock(&rgb->tdev->lock); + mutex_lock(&led->rgb->tdev->lock); - if (thingm_write_color(rgb)) - hid_err(rgb->tdev->hdev, "failed to write color\n"); + ret = thingm_write_color(led->rgb); + if (ret) + hid_err(led->rgb->tdev->hdev, "failed to write color\n"); - mutex_unlock(&rgb->tdev->lock); -} + mutex_unlock(&led->rgb->tdev->lock); -static void thingm_led_set(struct led_classdev *ldev, - enum led_brightness brightness) -{ - struct thingm_led *led = container_of(ldev, struct thingm_led, ldev); - - /* the ledclass has already stored the brightness value */ - schedule_work(&led->rgb->work); + return ret; } static int thingm_init_rgb(struct thingm_rgb *rgb) @@ -162,7 +156,7 @@ static int thingm_init_rgb(struct thingm_rgb *rgb) "thingm%d:red:led%d", minor, rgb->num); rgb->red.ldev.name = rgb->red.name; rgb->red.ldev.max_brightness = 255; - rgb->red.ldev.brightness_set = thingm_led_set; + rgb->red.ldev.brightness_set_blocking = thingm_led_set; rgb->red.rgb = rgb; err = led_classdev_register(&rgb->tdev->hdev->dev, &rgb->red.ldev); @@ -174,7 +168,7 @@ static int thingm_init_rgb(struct thingm_rgb *rgb) "thingm%d:green:led%d", minor, rgb->num); rgb->green.ldev.name = rgb->green.name; rgb->green.ldev.max_brightness = 255; - rgb->green.ldev.brightness_set = thingm_led_set; + rgb->green.ldev.brightness_set_blocking = thingm_led_set; rgb->green.rgb = rgb; err = led_classdev_register(&rgb->tdev->hdev->dev, &rgb->green.ldev); @@ -186,15 +180,13 @@ static int thingm_init_rgb(struct thingm_rgb *rgb) "thingm%d:blue:led%d", minor, rgb->num); rgb->blue.ldev.name = rgb->blue.name; rgb->blue.ldev.max_brightness = 255; - rgb->blue.ldev.brightness_set = thingm_led_set; + rgb->blue.ldev.brightness_set_blocking = thingm_led_set; rgb->blue.rgb = rgb; err = led_classdev_register(&rgb->tdev->hdev->dev, &rgb->blue.ldev); if (err) goto unregister_green; - INIT_WORK(&rgb->work, thingm_work); - return 0; unregister_green: @@ -211,7 +203,6 @@ static void thingm_remove_rgb(struct thingm_rgb *rgb) led_classdev_unregister(&rgb->red.ldev); led_classdev_unregister(&rgb->green.ldev); led_classdev_unregister(&rgb->blue.ldev); - flush_work(&rgb->work); } static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)