@@ -222,10 +222,9 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip,
222
222
*/
223
223
pdata -> dimming_mode = DIMMING_ANALOG_I2C ;
224
224
if (device_property_present (dev , "pwms" )) {
225
- chip -> pwmd = devm_pwm_get (chip -> dev , NULL );
225
+ chip -> pwmd = devm_pwm_get (dev , NULL );
226
226
if (IS_ERR (chip -> pwmd ))
227
- return dev_err_probe (chip -> dev , PTR_ERR (chip -> pwmd ),
228
- "error getting pwm data\n" );
227
+ return dev_err_probe (dev , PTR_ERR (chip -> pwmd ), "error getting pwm data\n" );
229
228
pdata -> dimming_mode = DIMMING_PWM ;
230
229
pwm_apply_args (chip -> pwmd );
231
230
}
@@ -243,11 +242,9 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip,
243
242
num_levels = ANALOG_I2C_NUM_LEVELS ;
244
243
245
244
/* Enable GPIO used in I2C dimming mode only */
246
- chip -> enable_gpio = devm_gpiod_get (chip -> dev , "enable" ,
247
- GPIOD_OUT_HIGH );
245
+ chip -> enable_gpio = devm_gpiod_get (dev , "enable" , GPIOD_OUT_HIGH );
248
246
if (IS_ERR (chip -> enable_gpio ))
249
- return dev_err_probe (chip -> dev ,
250
- PTR_ERR (chip -> enable_gpio ),
247
+ return dev_err_probe (dev , PTR_ERR (chip -> enable_gpio ),
251
248
"error getting enable gpio\n" );
252
249
} else {
253
250
/*
@@ -265,8 +262,7 @@ static int mp3309c_parse_fwnode(struct mp3309c_chip *chip,
265
262
}
266
263
267
264
/* Fill brightness levels array */
268
- pdata -> levels = devm_kcalloc (chip -> dev , num_levels ,
269
- sizeof (* pdata -> levels ), GFP_KERNEL );
265
+ pdata -> levels = devm_kcalloc (dev , num_levels , sizeof (* pdata -> levels ), GFP_KERNEL );
270
266
if (!pdata -> levels )
271
267
return - ENOMEM ;
272
268
if (device_property_present (dev , "brightness-levels" )) {
@@ -336,21 +332,21 @@ static int mp3309c_probe(struct i2c_client *client)
336
332
if (!i2c_check_functionality (client -> adapter , I2C_FUNC_I2C ))
337
333
return dev_err_probe (dev , - EOPNOTSUPP , "failed to check i2c functionality\n" );
338
334
339
- chip = devm_kzalloc (& client -> dev , sizeof (* chip ), GFP_KERNEL );
335
+ chip = devm_kzalloc (dev , sizeof (* chip ), GFP_KERNEL );
340
336
if (!chip )
341
337
return - ENOMEM ;
342
338
343
- chip -> dev = & client -> dev ;
339
+ chip -> dev = dev ;
344
340
345
341
chip -> regmap = devm_regmap_init_i2c (client , & mp3309c_regmap );
346
342
if (IS_ERR (chip -> regmap ))
347
- return dev_err_probe (& client -> dev , PTR_ERR (chip -> regmap ),
343
+ return dev_err_probe (dev , PTR_ERR (chip -> regmap ),
348
344
"failed to allocate register map\n" );
349
345
350
346
i2c_set_clientdata (client , chip );
351
347
352
348
if (!pdata ) {
353
- pdata = devm_kzalloc (chip -> dev , sizeof (* pdata ), GFP_KERNEL );
349
+ pdata = devm_kzalloc (dev , sizeof (* pdata ), GFP_KERNEL );
354
350
if (!pdata )
355
351
return - ENOMEM ;
356
352
@@ -367,11 +363,10 @@ static int mp3309c_probe(struct i2c_client *client)
367
363
props .type = BACKLIGHT_RAW ;
368
364
props .power = FB_BLANK_UNBLANK ;
369
365
props .fb_blank = FB_BLANK_UNBLANK ;
370
- chip -> bl = devm_backlight_device_register (chip -> dev , "mp3309c" ,
371
- chip -> dev , chip ,
366
+ chip -> bl = devm_backlight_device_register (dev , "mp3309c" , dev , chip ,
372
367
& mp3309c_bl_ops , & props );
373
368
if (IS_ERR (chip -> bl ))
374
- return dev_err_probe (chip -> dev , PTR_ERR (chip -> bl ),
369
+ return dev_err_probe (dev , PTR_ERR (chip -> bl ),
375
370
"error registering backlight device\n" );
376
371
377
372
/* In PWM dimming mode, enable pwm device */
@@ -383,8 +378,7 @@ static int mp3309c_probe(struct i2c_client *client)
383
378
pwmstate .enabled = true;
384
379
ret = pwm_apply_might_sleep (chip -> pwmd , & pwmstate );
385
380
if (ret )
386
- return dev_err_probe (chip -> dev , ret ,
387
- "error setting pwm device\n" );
381
+ return dev_err_probe (dev , ret , "error setting pwm device\n" );
388
382
}
389
383
390
384
chip -> pdata -> status = FIRST_POWER_ON ;
0 commit comments