Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

leds: adp5520: Remove work queue

Now the core implements the work queue, remove it from the driver,
and switch to using brightness_set_blocking op.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

authored by

Andrew Lunn and committed by
Jacek Anaszewski
64d44e5a 8824fefb

+5 -21
+5 -21
drivers/leds/leds-adp5520.c
··· 17 17 #include <linux/kernel.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/leds.h> 20 - #include <linux/workqueue.h> 21 20 #include <linux/mfd/adp5520.h> 22 21 #include <linux/slab.h> 23 22 24 23 struct adp5520_led { 25 24 struct led_classdev cdev; 26 - struct work_struct work; 27 25 struct device *master; 28 - enum led_brightness new_brightness; 29 26 int id; 30 27 int flags; 31 28 }; 32 29 33 - static void adp5520_led_work(struct work_struct *work) 34 - { 35 - struct adp5520_led *led = container_of(work, struct adp5520_led, work); 36 - adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1, 37 - led->new_brightness >> 2); 38 - } 39 - 40 - static void adp5520_led_set(struct led_classdev *led_cdev, 30 + static int adp5520_led_set(struct led_classdev *led_cdev, 41 31 enum led_brightness value) 42 32 { 43 33 struct adp5520_led *led; 44 34 45 35 led = container_of(led_cdev, struct adp5520_led, cdev); 46 - led->new_brightness = value; 47 - schedule_work(&led->work); 36 + return adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1, 37 + value >> 2); 48 38 } 49 39 50 40 static int adp5520_led_setup(struct adp5520_led *led) ··· 125 135 126 136 led_dat->cdev.name = cur_led->name; 127 137 led_dat->cdev.default_trigger = cur_led->default_trigger; 128 - led_dat->cdev.brightness_set = adp5520_led_set; 138 + led_dat->cdev.brightness_set_blocking = adp5520_led_set; 129 139 led_dat->cdev.brightness = LED_OFF; 130 140 131 141 if (cur_led->flags & ADP5520_FLAG_LED_MASK) ··· 136 146 led_dat->id = led_dat->flags & ADP5520_FLAG_LED_MASK; 137 147 138 148 led_dat->master = pdev->dev.parent; 139 - led_dat->new_brightness = LED_OFF; 140 - 141 - INIT_WORK(&led_dat->work, adp5520_led_work); 142 149 143 150 ret = led_classdev_register(led_dat->master, &led_dat->cdev); 144 151 if (ret) { ··· 157 170 158 171 err: 159 172 if (i > 0) { 160 - for (i = i - 1; i >= 0; i--) { 173 + for (i = i - 1; i >= 0; i--) 161 174 led_classdev_unregister(&led[i].cdev); 162 - cancel_work_sync(&led[i].work); 163 - } 164 175 } 165 176 166 177 return ret; ··· 177 192 178 193 for (i = 0; i < pdata->num_leds; i++) { 179 194 led_classdev_unregister(&led[i].cdev); 180 - cancel_work_sync(&led[i].work); 181 195 } 182 196 183 197 return 0;