aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-11 02:03:33 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-12 17:20:31 -0500
commitba4cf3783854346051ed5a243220f37c0c865350 (patch)
tree24d220d1c1b52d9e8a828b90ad571282e99278ea
parent5a8a6b89c15766446d845671d574a9243b6d8786 (diff)
Input: drv260x - use temporary for &client->dev
Let's introduce a temporary for "client->dev" is probe() as we use it quite a few times and "dev" is shorter. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/misc/drv260x.c37
1 files changed, 15 insertions, 22 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 251d64ca41ce..a26aa548dd66 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -514,10 +514,11 @@ static int drv260x_probe(struct i2c_client *client,
514 const struct i2c_device_id *id) 514 const struct i2c_device_id *id)
515{ 515{
516 const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev); 516 const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev);
517 struct device *dev = &client->dev;
517 struct drv260x_data *haptics; 518 struct drv260x_data *haptics;
518 int error; 519 int error;
519 520
520 haptics = devm_kzalloc(&client->dev, sizeof(*haptics), GFP_KERNEL); 521 haptics = devm_kzalloc(dev, sizeof(*haptics), GFP_KERNEL);
521 if (!haptics) 522 if (!haptics)
522 return -ENOMEM; 523 return -ENOMEM;
523 524
@@ -536,22 +537,20 @@ static int drv260x_probe(struct i2c_client *client,
536 if (error) 537 if (error)
537 return error; 538 return error;
538 } else { 539 } else {
539 dev_err(&client->dev, "Platform data not set\n"); 540 dev_err(dev, "Platform data not set\n");
540 return -ENODEV; 541 return -ENODEV;
541 } 542 }
542 543
543 544
544 if (haptics->mode < DRV260X_LRA_MODE || 545 if (haptics->mode < DRV260X_LRA_MODE ||
545 haptics->mode > DRV260X_ERM_MODE) { 546 haptics->mode > DRV260X_ERM_MODE) {
546 dev_err(&client->dev, 547 dev_err(dev, "Vibrator mode is invalid: %i\n", haptics->mode);
547 "Vibrator mode is invalid: %i\n",
548 haptics->mode);
549 return -EINVAL; 548 return -EINVAL;
550 } 549 }
551 550
552 if (haptics->library < DRV260X_LIB_EMPTY || 551 if (haptics->library < DRV260X_LIB_EMPTY ||
553 haptics->library > DRV260X_ERM_LIB_F) { 552 haptics->library > DRV260X_ERM_LIB_F) {
554 dev_err(&client->dev, 553 dev_err(dev,
555 "Library value is invalid: %i\n", haptics->library); 554 "Library value is invalid: %i\n", haptics->library);
556 return -EINVAL; 555 return -EINVAL;
557 } 556 }
@@ -559,33 +558,30 @@ static int drv260x_probe(struct i2c_client *client,
559 if (haptics->mode == DRV260X_LRA_MODE && 558 if (haptics->mode == DRV260X_LRA_MODE &&
560 haptics->library != DRV260X_LIB_EMPTY && 559 haptics->library != DRV260X_LIB_EMPTY &&
561 haptics->library != DRV260X_LIB_LRA) { 560 haptics->library != DRV260X_LIB_LRA) {
562 dev_err(&client->dev, 561 dev_err(dev, "LRA Mode with ERM Library mismatch\n");
563 "LRA Mode with ERM Library mismatch\n");
564 return -EINVAL; 562 return -EINVAL;
565 } 563 }
566 564
567 if (haptics->mode == DRV260X_ERM_MODE && 565 if (haptics->mode == DRV260X_ERM_MODE &&
568 (haptics->library == DRV260X_LIB_EMPTY || 566 (haptics->library == DRV260X_LIB_EMPTY ||
569 haptics->library == DRV260X_LIB_LRA)) { 567 haptics->library == DRV260X_LIB_LRA)) {
570 dev_err(&client->dev, 568 dev_err(dev, "ERM Mode with LRA Library mismatch\n");
571 "ERM Mode with LRA Library mismatch\n");
572 return -EINVAL; 569 return -EINVAL;
573 } 570 }
574 571
575 haptics->regulator = devm_regulator_get(&client->dev, "vbat"); 572 haptics->regulator = devm_regulator_get(dev, "vbat");
576 if (IS_ERR(haptics->regulator)) { 573 if (IS_ERR(haptics->regulator)) {
577 error = PTR_ERR(haptics->regulator); 574 error = PTR_ERR(haptics->regulator);
578 dev_err(&client->dev, 575 dev_err(dev, "unable to get regulator, error: %d\n", error);
579 "unable to get regulator, error: %d\n", error);
580 return error; 576 return error;
581 } 577 }
582 578
583 haptics->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable", 579 haptics->enable_gpio = devm_gpiod_get_optional(dev, "enable",
584 GPIOD_OUT_HIGH); 580 GPIOD_OUT_HIGH);
585 if (IS_ERR(haptics->enable_gpio)) 581 if (IS_ERR(haptics->enable_gpio))
586 return PTR_ERR(haptics->enable_gpio); 582 return PTR_ERR(haptics->enable_gpio);
587 583
588 haptics->input_dev = devm_input_allocate_device(&client->dev); 584 haptics->input_dev = devm_input_allocate_device(dev);
589 if (!haptics->input_dev) { 585 if (!haptics->input_dev) {
590 dev_err(&client->dev, "Failed to allocate input device\n"); 586 dev_err(&client->dev, "Failed to allocate input device\n");
591 return -ENOMEM; 587 return -ENOMEM;
@@ -599,8 +595,7 @@ static int drv260x_probe(struct i2c_client *client,
599 error = input_ff_create_memless(haptics->input_dev, NULL, 595 error = input_ff_create_memless(haptics->input_dev, NULL,
600 drv260x_haptics_play); 596 drv260x_haptics_play);
601 if (error) { 597 if (error) {
602 dev_err(&client->dev, "input_ff_create() failed: %d\n", 598 dev_err(dev, "input_ff_create() failed: %d\n", error);
603 error);
604 return error; 599 return error;
605 } 600 }
606 601
@@ -612,21 +607,19 @@ static int drv260x_probe(struct i2c_client *client,
612 haptics->regmap = devm_regmap_init_i2c(client, &drv260x_regmap_config); 607 haptics->regmap = devm_regmap_init_i2c(client, &drv260x_regmap_config);
613 if (IS_ERR(haptics->regmap)) { 608 if (IS_ERR(haptics->regmap)) {
614 error = PTR_ERR(haptics->regmap); 609 error = PTR_ERR(haptics->regmap);
615 dev_err(&client->dev, "Failed to allocate register map: %d\n", 610 dev_err(dev, "Failed to allocate register map: %d\n", error);
616 error);
617 return error; 611 return error;
618 } 612 }
619 613
620 error = drv260x_init(haptics); 614 error = drv260x_init(haptics);
621 if (error) { 615 if (error) {
622 dev_err(&client->dev, "Device init failed: %d\n", error); 616 dev_err(dev, "Device init failed: %d\n", error);
623 return error; 617 return error;
624 } 618 }
625 619
626 error = input_register_device(haptics->input_dev); 620 error = input_register_device(haptics->input_dev);
627 if (error) { 621 if (error) {
628 dev_err(&client->dev, "couldn't register input device: %d\n", 622 dev_err(dev, "couldn't register input device: %d\n", error);
629 error);
630 return error; 623 return error;
631 } 624 }
632 625