@@ -255,33 +255,23 @@ static int omnia_led_register(struct i2c_client *client, struct omnia_led *led,
255
255
/* put the LED into software mode */
256
256
ret = omnia_cmd_write_u8 (client , OMNIA_CMD_LED_MODE , OMNIA_CMD_LED_MODE_LED (led -> reg ) |
257
257
OMNIA_CMD_LED_MODE_USER );
258
- if (ret ) {
259
- dev_err (dev , "Cannot set LED %pOF to software mode: %i\n" , np ,
260
- ret );
261
- return ret ;
262
- }
258
+ if (ret )
259
+ return dev_err_probe (dev , ret , "Cannot set LED %pOF to software mode\n" , np );
263
260
264
261
/* disable the LED */
265
262
ret = omnia_cmd_write_u8 (client , OMNIA_CMD_LED_STATE , OMNIA_CMD_LED_STATE_LED (led -> reg ));
266
- if (ret ) {
267
- dev_err (dev , "Cannot set LED %pOF brightness: %i\n" , np , ret );
268
- return ret ;
269
- }
263
+ if (ret )
264
+ return dev_err_probe (dev , ret , "Cannot set LED %pOF brightness\n" , np );
270
265
271
266
/* Set initial color and cache it */
272
267
ret = omnia_led_send_color_cmd (client , led );
273
- if (ret < 0 ) {
274
- dev_err (dev , "Cannot set LED %pOF initial color: %i\n" , np ,
275
- ret );
276
- return ret ;
277
- }
268
+ if (ret < 0 )
269
+ return dev_err_probe (dev , ret , "Cannot set LED %pOF initial color\n" , np );
278
270
279
271
ret = devm_led_classdev_multicolor_register_ext (dev , & led -> mc_cdev ,
280
272
& init_data );
281
- if (ret < 0 ) {
282
- dev_err (dev , "Cannot register LED %pOF: %i\n" , np , ret );
283
- return ret ;
284
- }
273
+ if (ret < 0 )
274
+ return dev_err_probe (dev , ret , "Cannot register LED %pOF\n" , np );
285
275
286
276
return 1 ;
287
277
}
@@ -484,13 +474,10 @@ static int omnia_leds_probe(struct i2c_client *client)
484
474
int ret , count ;
485
475
486
476
count = of_get_available_child_count (np );
487
- if (!count ) {
488
- dev_err (dev , "LEDs are not defined in device tree!\n" );
489
- return - ENODEV ;
490
- } else if (count > OMNIA_BOARD_LEDS ) {
491
- dev_err (dev , "Too many LEDs defined in device tree!\n" );
492
- return - EINVAL ;
493
- }
477
+ if (count == 0 )
478
+ return dev_err_probe (dev , - ENODEV , "LEDs are not defined in device tree!\n" );
479
+ if (count > OMNIA_BOARD_LEDS )
480
+ return dev_err_probe (dev , - EINVAL , "Too many LEDs defined in device tree!\n" );
494
481
495
482
leds = devm_kzalloc (dev , struct_size (leds , leds , count ), GFP_KERNEL );
496
483
if (!leds )
@@ -500,11 +487,8 @@ static int omnia_leds_probe(struct i2c_client *client)
500
487
i2c_set_clientdata (client , leds );
501
488
502
489
ret = omnia_find_mcu_and_get_features (dev );
503
- if (ret < 0 ) {
504
- dev_err (dev , "Cannot determine MCU supported features: %d\n" ,
505
- ret );
506
- return ret ;
507
- }
490
+ if (ret < 0 )
491
+ return dev_err_probe (dev , ret , "Cannot determine MCU supported features\n" );
508
492
509
493
leds -> has_gamma_correction = ret & OMNIA_FEAT_LED_GAMMA_CORRECTION ;
510
494
@@ -517,10 +501,8 @@ static int omnia_leds_probe(struct i2c_client *client)
517
501
mutex_init (& leds -> lock );
518
502
519
503
ret = devm_led_trigger_register (dev , & omnia_hw_trigger );
520
- if (ret < 0 ) {
521
- dev_err (dev , "Cannot register private LED trigger: %d\n" , ret );
522
- return ret ;
523
- }
504
+ if (ret < 0 )
505
+ return dev_err_probe (dev , ret , "Cannot register private LED trigger\n" );
524
506
525
507
led = & leds -> leds [0 ];
526
508
for_each_available_child_of_node_scoped (np , child ) {
0 commit comments