Skip to content

Commit a2ad800

Browse files
Wenping Zhangrkhuangtao
authored andcommitted
leds: leds-is31fl32xx: fix compile errors.
The is32fl32xx led driver from upstream is written for new led framework, so just modify this driver for some api difference between our current led framework. Change-Id: I0fd9af4bc2cd419d3e0bcd1b2348d34d166d652b Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
1 parent feb1737 commit a2ad800

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/leds/leds-is31fl32xx.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static int is31fl3216_software_shutdown(struct is31fl32xx_priv *priv,
223223
* are equivalent. Poking the Update register merely applies all PWM
224224
* register writes up to that point.
225225
*/
226-
static int is31fl32xx_brightness_set(struct led_classdev *led_cdev,
226+
static void is31fl32xx_brightness_set(struct led_classdev *led_cdev,
227227
enum led_brightness brightness)
228228
{
229229
const struct is31fl32xx_led_data *led_data =
@@ -244,9 +244,11 @@ static int is31fl32xx_brightness_set(struct led_classdev *led_cdev,
244244
cdef->pwm_register_base + pwm_register_offset,
245245
brightness);
246246
if (ret)
247-
return ret;
247+
dev_err(led_cdev->dev,
248+
"set brightness %d for led[%d] failed\n",
249+
brightness, pwm_register_offset);
248250

249-
return is31fl32xx_write(led_data->priv, cdef->pwm_update_reg, 0);
251+
is31fl32xx_write(led_data->priv, cdef->pwm_update_reg, 0);
250252
}
251253

252254
static int is31fl32xx_reset_regs(struct is31fl32xx_priv *priv)
@@ -335,7 +337,7 @@ static inline size_t sizeof_is31fl32xx_priv(int num_leds)
335337
}
336338

337339
static int is31fl32xx_parse_child_dt(const struct device *dev,
338-
const struct device_node *child,
340+
struct device_node *child,
339341
struct is31fl32xx_led_data *led_data)
340342
{
341343
struct led_classdev *cdev = &led_data->cdev;
@@ -357,7 +359,7 @@ static int is31fl32xx_parse_child_dt(const struct device *dev,
357359
of_property_read_string(child, "linux,default-trigger",
358360
&cdev->default_trigger);
359361

360-
cdev->brightness_set_blocking = is31fl32xx_brightness_set;
362+
cdev->brightness_set = is31fl32xx_brightness_set;
361363

362364
return 0;
363365
}

0 commit comments

Comments
 (0)