diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-07-12 07:32:03 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-07-30 20:02:56 -0400 |
commit | 37aefe9f05a802a2f6f39642ae9f6ca8538df3a9 (patch) | |
tree | 944c709f2787df1cc08d8e925daae000a63f62c1 /drivers/mfd/twl6040.c | |
parent | df04b6242a584ab3dcfe89221775085f60ba83dd (diff) |
mfd: twl6040: Cosmetic, parameter alignment change
To comply with coding style.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl6040.c')
-rw-r--r-- | drivers/mfd/twl6040.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index a4034ed66dc0..3bd110e7f518 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c | |||
@@ -549,7 +549,7 @@ static int twl6040_probe(struct i2c_client *client, | |||
549 | twl6040->supplies[0].supply = "vio"; | 549 | twl6040->supplies[0].supply = "vio"; |
550 | twl6040->supplies[1].supply = "v2v1"; | 550 | twl6040->supplies[1].supply = "v2v1"; |
551 | ret = devm_regulator_bulk_get(&client->dev, TWL6040_NUM_SUPPLIES, | 551 | ret = devm_regulator_bulk_get(&client->dev, TWL6040_NUM_SUPPLIES, |
552 | twl6040->supplies); | 552 | twl6040->supplies); |
553 | if (ret != 0) { | 553 | if (ret != 0) { |
554 | dev_err(&client->dev, "Failed to get supplies: %d\n", ret); | 554 | dev_err(&client->dev, "Failed to get supplies: %d\n", ret); |
555 | goto regulator_get_err; | 555 | goto regulator_get_err; |
@@ -578,33 +578,32 @@ static int twl6040_probe(struct i2c_client *client, | |||
578 | 578 | ||
579 | if (gpio_is_valid(twl6040->audpwron)) { | 579 | if (gpio_is_valid(twl6040->audpwron)) { |
580 | ret = devm_gpio_request_one(&client->dev, twl6040->audpwron, | 580 | ret = devm_gpio_request_one(&client->dev, twl6040->audpwron, |
581 | GPIOF_OUT_INIT_LOW, "audpwron"); | 581 | GPIOF_OUT_INIT_LOW, "audpwron"); |
582 | if (ret) | 582 | if (ret) |
583 | goto gpio_err; | 583 | goto gpio_err; |
584 | } | 584 | } |
585 | 585 | ||
586 | ret = regmap_add_irq_chip(twl6040->regmap, twl6040->irq, | 586 | ret = regmap_add_irq_chip(twl6040->regmap, twl6040->irq, IRQF_ONESHOT, |
587 | IRQF_ONESHOT, 0, &twl6040_irq_chip, | 587 | 0, &twl6040_irq_chip,&twl6040->irq_data); |
588 | &twl6040->irq_data); | ||
589 | if (ret < 0) | 588 | if (ret < 0) |
590 | goto gpio_err; | 589 | goto gpio_err; |
591 | 590 | ||
592 | twl6040->irq_ready = regmap_irq_get_virq(twl6040->irq_data, | 591 | twl6040->irq_ready = regmap_irq_get_virq(twl6040->irq_data, |
593 | TWL6040_IRQ_READY); | 592 | TWL6040_IRQ_READY); |
594 | twl6040->irq_th = regmap_irq_get_virq(twl6040->irq_data, | 593 | twl6040->irq_th = regmap_irq_get_virq(twl6040->irq_data, |
595 | TWL6040_IRQ_TH); | 594 | TWL6040_IRQ_TH); |
596 | 595 | ||
597 | ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_ready, NULL, | 596 | ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_ready, NULL, |
598 | twl6040_readyint_handler, IRQF_ONESHOT, | 597 | twl6040_readyint_handler, IRQF_ONESHOT, |
599 | "twl6040_irq_ready", twl6040); | 598 | "twl6040_irq_ready", twl6040); |
600 | if (ret) { | 599 | if (ret) { |
601 | dev_err(twl6040->dev, "READY IRQ request failed: %d\n", ret); | 600 | dev_err(twl6040->dev, "READY IRQ request failed: %d\n", ret); |
602 | goto readyirq_err; | 601 | goto readyirq_err; |
603 | } | 602 | } |
604 | 603 | ||
605 | ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_th, NULL, | 604 | ret = devm_request_threaded_irq(twl6040->dev, twl6040->irq_th, NULL, |
606 | twl6040_thint_handler, IRQF_ONESHOT, | 605 | twl6040_thint_handler, IRQF_ONESHOT, |
607 | "twl6040_irq_th", twl6040); | 606 | "twl6040_irq_th", twl6040); |
608 | if (ret) { | 607 | if (ret) { |
609 | dev_err(twl6040->dev, "Thermal IRQ request failed: %d\n", ret); | 608 | dev_err(twl6040->dev, "Thermal IRQ request failed: %d\n", ret); |
610 | goto thirq_err; | 609 | goto thirq_err; |