diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-02-21 19:43:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:22:21 -0500 |
commit | 2ca8b90af6c7592a5470e9f724db089c960e3f02 (patch) | |
tree | 09621429a2c7f27b0510cb6b9c321b4634bb0583 /drivers/video/backlight | |
parent | 30f085ca0423b1f4387ff3f30d13f239a4ac826d (diff) |
backlight: ld9040: remove redundant return variables
Redundant return variables are removed to reduce the code.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/ld9040.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/drivers/video/backlight/ld9040.c b/drivers/video/backlight/ld9040.c index fd7bb1cf21a8..bdc1a7e58337 100644 --- a/drivers/video/backlight/ld9040.c +++ b/drivers/video/backlight/ld9040.c | |||
@@ -513,14 +513,9 @@ gamma_err: | |||
513 | 513 | ||
514 | static int ld9040_gamma_ctl(struct ld9040 *lcd, int gamma) | 514 | static int ld9040_gamma_ctl(struct ld9040 *lcd, int gamma) |
515 | { | 515 | { |
516 | int ret = 0; | 516 | return _ld9040_gamma_ctl(lcd, gamma_table.gamma_22_table[gamma]); |
517 | |||
518 | ret = _ld9040_gamma_ctl(lcd, gamma_table.gamma_22_table[gamma]); | ||
519 | |||
520 | return ret; | ||
521 | } | 517 | } |
522 | 518 | ||
523 | |||
524 | static int ld9040_ldi_init(struct ld9040 *lcd) | 519 | static int ld9040_ldi_init(struct ld9040 *lcd) |
525 | { | 520 | { |
526 | int ret, i; | 521 | int ret, i; |
@@ -549,11 +544,7 @@ static int ld9040_ldi_init(struct ld9040 *lcd) | |||
549 | 544 | ||
550 | static int ld9040_ldi_enable(struct ld9040 *lcd) | 545 | static int ld9040_ldi_enable(struct ld9040 *lcd) |
551 | { | 546 | { |
552 | int ret = 0; | 547 | return ld9040_panel_send_sequence(lcd, seq_display_on); |
553 | |||
554 | ret = ld9040_panel_send_sequence(lcd, seq_display_on); | ||
555 | |||
556 | return ret; | ||
557 | } | 548 | } |
558 | 549 | ||
559 | static int ld9040_ldi_disable(struct ld9040 *lcd) | 550 | static int ld9040_ldi_disable(struct ld9040 *lcd) |
@@ -696,7 +687,6 @@ static const struct backlight_ops ld9040_backlight_ops = { | |||
696 | .update_status = ld9040_set_brightness, | 687 | .update_status = ld9040_set_brightness, |
697 | }; | 688 | }; |
698 | 689 | ||
699 | |||
700 | static int ld9040_probe(struct spi_device *spi) | 690 | static int ld9040_probe(struct spi_device *spi) |
701 | { | 691 | { |
702 | int ret = 0; | 692 | int ret = 0; |
@@ -802,7 +792,6 @@ static int ld9040_remove(struct spi_device *spi) | |||
802 | #if defined(CONFIG_PM) | 792 | #if defined(CONFIG_PM) |
803 | static int ld9040_suspend(struct spi_device *spi, pm_message_t mesg) | 793 | static int ld9040_suspend(struct spi_device *spi, pm_message_t mesg) |
804 | { | 794 | { |
805 | int ret = 0; | ||
806 | struct ld9040 *lcd = dev_get_drvdata(&spi->dev); | 795 | struct ld9040 *lcd = dev_get_drvdata(&spi->dev); |
807 | 796 | ||
808 | dev_dbg(&spi->dev, "lcd->power = %d\n", lcd->power); | 797 | dev_dbg(&spi->dev, "lcd->power = %d\n", lcd->power); |
@@ -811,21 +800,16 @@ static int ld9040_suspend(struct spi_device *spi, pm_message_t mesg) | |||
811 | * when lcd panel is suspend, lcd panel becomes off | 800 | * when lcd panel is suspend, lcd panel becomes off |
812 | * regardless of status. | 801 | * regardless of status. |
813 | */ | 802 | */ |
814 | ret = ld9040_power(lcd, FB_BLANK_POWERDOWN); | 803 | return ld9040_power(lcd, FB_BLANK_POWERDOWN); |
815 | |||
816 | return ret; | ||
817 | } | 804 | } |
818 | 805 | ||
819 | static int ld9040_resume(struct spi_device *spi) | 806 | static int ld9040_resume(struct spi_device *spi) |
820 | { | 807 | { |
821 | int ret = 0; | ||
822 | struct ld9040 *lcd = dev_get_drvdata(&spi->dev); | 808 | struct ld9040 *lcd = dev_get_drvdata(&spi->dev); |
823 | 809 | ||
824 | lcd->power = FB_BLANK_POWERDOWN; | 810 | lcd->power = FB_BLANK_POWERDOWN; |
825 | 811 | ||
826 | ret = ld9040_power(lcd, FB_BLANK_UNBLANK); | 812 | return ld9040_power(lcd, FB_BLANK_UNBLANK); |
827 | |||
828 | return ret; | ||
829 | } | 813 | } |
830 | #else | 814 | #else |
831 | #define ld9040_suspend NULL | 815 | #define ld9040_suspend NULL |