aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-02-11 21:02:43 -0500
committerLee Jones <lee.jones@linaro.org>2016-02-12 03:53:51 -0500
commit2260a45356756285faa0b46f0afa53c7f251fb9c (patch)
treeba9ff7a955f10cc53b12efd1f3e5c154ae32abce
parent4fd411514291ae75053003e33a6a4a56f97467d0 (diff)
mfd: axp20x: Whitespace, open parenthesis alignment code style fixes
This fixes some leftover code style issues in the axp20x core. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/axp20x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 8e569bcfe3bc..3054ea4b95e8 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -593,14 +593,14 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
593 dev_err(dev, "Unable to match OF ID\n"); 593 dev_err(dev, "Unable to match OF ID\n");
594 return -ENODEV; 594 return -ENODEV;
595 } 595 }
596 axp20x->variant = (long) of_id->data; 596 axp20x->variant = (long)of_id->data;
597 } else { 597 } else {
598 acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); 598 acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
599 if (!acpi_id || !acpi_id->driver_data) { 599 if (!acpi_id || !acpi_id->driver_data) {
600 dev_err(dev, "Unable to match ACPI ID and data\n"); 600 dev_err(dev, "Unable to match ACPI ID and data\n");
601 return -ENODEV; 601 return -ENODEV;
602 } 602 }
603 axp20x->variant = (long) acpi_id->driver_data; 603 axp20x->variant = (long)acpi_id->driver_data;
604 } 604 }
605 605
606 switch (axp20x->variant) { 606 switch (axp20x->variant) {
@@ -634,7 +634,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
634 return -EINVAL; 634 return -EINVAL;
635 } 635 }
636 dev_info(dev, "AXP20x variant %s found\n", 636 dev_info(dev, "AXP20x variant %s found\n",
637 axp20x_model_names[axp20x->variant]); 637 axp20x_model_names[axp20x->variant]);
638 638
639 return 0; 639 return 0;
640} 640}
@@ -654,7 +654,7 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
654 } 654 }
655 655
656 ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells, 656 ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells,
657 axp20x->nr_cells, NULL, 0, NULL); 657 axp20x->nr_cells, NULL, 0, NULL);
658 658
659 if (ret) { 659 if (ret) {
660 dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret); 660 dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);