Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946307AbbGQJJt (ORCPT ); Fri, 17 Jul 2015 05:09:49 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:56712 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932248AbbGQIsh (ORCPT ); Fri, 17 Jul 2015 04:48:37 -0400 X-AuditID: cbfee61b-f79416d0000014c0-c4-55a8c15b3425 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 , Daniel Jeong , "G.Shark Jeong" Subject: [PATCH/RFC 13/51] leds: lm3642: Remove work queue Date: Fri, 17 Jul 2015 10:46:59 +0200 Message-id: <1437122857-6765-14-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1437122857-6765-1-git-send-email-j.anaszewski@samsung.com> References: <1437122857-6765-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDLMWRmVeSWpSXmKPExsVy+t9jAd3ogytCDZqv6Fmcv3uI2eLozolM Fnu2PWW2mLy7i9Xi8q45bBZb36xjtNi96ymrRWffNBYHDo+ds+6ye+zc8ZnJY8/8H6wex29s Z/JoOtXO6vF5k1wAWxSXTUpqTmZZapG+XQJXxvpD9gX31SomfNzG2sD4WqGLkZNDQsBEYv/e mcwQtpjEhXvr2boYuTiEBBYxSrTP6oJyfjJKXL13nR2kik3AUOLni9dMXYwcHCICchI7z1SC 1DALXGaUmP72JhtIjbCAlUTbsb1MIDaLgKrEvZkbwGxeAQ+J2S9fsoP0SggoSMyZZAMS5gQK v3+wkgXEFhJwl2j7c5FtAiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxjBYfZMegfj qgaLQ4wCHIxKPLwNritChVgTy4orcw8xSnAwK4nwVu4ECvGmJFZWpRblxxeV5qQWH2KU5mBR Euc9me8TKiSQnliSmp2aWpBaBJNl4uCUamBUDK5JO3Qsce+vLULmJ55MeJ9kvdBpySmNxtzp cgIuVSsmxc1/v/72w7ZTN4+GJAue4V3Pyp37x2GnrWKn5oT1flU3PN6kiRyPf2Nx/5rMFI9L cct19TXuf+3dysp3/LhoiOLBe77XNq+PfiXTG1ddnGKdsf/chGSn0ifO7H9bhW+sW3pjP+Mq JZbijERDLeai4kQA6mpOXi8CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5050 Lines: 159 From: Andrew Lunn Now the core implements the work queue, remove it from the driver. Signed-off-by: Andrew Lunn Cc: Daniel Jeong Cc: G.Shark Jeong --- drivers/leds/leds-lm3642.c | 54 ++++++++------------------------------------ 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/drivers/leds/leds-lm3642.c b/drivers/leds/leds-lm3642.c index d3dec01..b54f98d 100644 --- a/drivers/leds/leds-lm3642.c +++ b/drivers/leds/leds-lm3642.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #define REG_FILT_TIME (0x0) @@ -73,10 +72,6 @@ struct lm3642_chip_data { struct led_classdev cdev_torch; struct led_classdev cdev_indicator; - struct work_struct work_flash; - struct work_struct work_torch; - struct work_struct work_indicator; - u8 br_flash; u8 br_torch; u8 br_indicator; @@ -209,24 +204,16 @@ out_strtoint: static DEVICE_ATTR(torch_pin, S_IWUSR, NULL, lm3642_torch_pin_store); -static void lm3642_deferred_torch_brightness_set(struct work_struct *work) -{ - struct lm3642_chip_data *chip = - container_of(work, struct lm3642_chip_data, work_torch); - - mutex_lock(&chip->lock); - lm3642_control(chip, chip->br_torch, MODES_TORCH); - mutex_unlock(&chip->lock); -} - static void lm3642_torch_brightness_set(struct led_classdev *cdev, enum led_brightness brightness) { struct lm3642_chip_data *chip = container_of(cdev, struct lm3642_chip_data, cdev_torch); + mutex_lock(&chip->lock); chip->br_torch = brightness; - schedule_work(&chip->work_torch); + lm3642_control(chip, chip->br_torch, MODES_TORCH); + mutex_unlock(&chip->lock); } /* flash */ @@ -266,45 +253,29 @@ out_strtoint: static DEVICE_ATTR(strobe_pin, S_IWUSR, NULL, lm3642_strobe_pin_store); -static void lm3642_deferred_strobe_brightness_set(struct work_struct *work) -{ - struct lm3642_chip_data *chip = - container_of(work, struct lm3642_chip_data, work_flash); - - mutex_lock(&chip->lock); - lm3642_control(chip, chip->br_flash, MODES_FLASH); - mutex_unlock(&chip->lock); -} - static void lm3642_strobe_brightness_set(struct led_classdev *cdev, enum led_brightness brightness) { struct lm3642_chip_data *chip = container_of(cdev, struct lm3642_chip_data, cdev_flash); - chip->br_flash = brightness; - schedule_work(&chip->work_flash); -} - -/* indicator */ -static void lm3642_deferred_indicator_brightness_set(struct work_struct *work) -{ - struct lm3642_chip_data *chip = - container_of(work, struct lm3642_chip_data, work_indicator); - mutex_lock(&chip->lock); - lm3642_control(chip, chip->br_indicator, MODES_INDIC); + chip->br_flash = brightness; + lm3642_control(chip, chip->br_flash, MODES_FLASH); mutex_unlock(&chip->lock); } +/* indicator */ static void lm3642_indicator_brightness_set(struct led_classdev *cdev, enum led_brightness brightness) { struct lm3642_chip_data *chip = container_of(cdev, struct lm3642_chip_data, cdev_indicator); + mutex_lock(&chip->lock); chip->br_indicator = brightness; - schedule_work(&chip->work_indicator); + lm3642_control(chip, chip->br_indicator, MODES_INDIC); + mutex_unlock(&chip->lock); } static const struct regmap_config lm3642_regmap = { @@ -371,7 +342,6 @@ static int lm3642_probe(struct i2c_client *client, goto err_out; /* flash */ - INIT_WORK(&chip->work_flash, lm3642_deferred_strobe_brightness_set); chip->cdev_flash.name = "flash"; chip->cdev_flash.max_brightness = 16; chip->cdev_flash.brightness_set = lm3642_strobe_brightness_set; @@ -385,7 +355,6 @@ static int lm3642_probe(struct i2c_client *client, } /* torch */ - INIT_WORK(&chip->work_torch, lm3642_deferred_torch_brightness_set); chip->cdev_torch.name = "torch"; chip->cdev_torch.max_brightness = 8; chip->cdev_torch.brightness_set = lm3642_torch_brightness_set; @@ -399,8 +368,6 @@ static int lm3642_probe(struct i2c_client *client, } /* indicator */ - INIT_WORK(&chip->work_indicator, - lm3642_deferred_indicator_brightness_set); chip->cdev_indicator.name = "indicator"; chip->cdev_indicator.max_brightness = 8; chip->cdev_indicator.brightness_set = lm3642_indicator_brightness_set; @@ -427,11 +394,8 @@ static int lm3642_remove(struct i2c_client *client) struct lm3642_chip_data *chip = i2c_get_clientdata(client); led_classdev_unregister(&chip->cdev_indicator); - flush_work(&chip->work_indicator); led_classdev_unregister(&chip->cdev_torch); - flush_work(&chip->work_torch); led_classdev_unregister(&chip->cdev_flash); - flush_work(&chip->work_flash); regmap_write(chip->regmap, REG_ENABLE, 0); 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/