diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-12 04:52:59 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-02-14 06:39:52 -0500 |
commit | 6a582bd52962b026e3b9b6796085d9eaf97b4f02 (patch) | |
tree | 7375765cadd335a39e5097da2260490bcd0de29b | |
parent | 07e521b66cf0645ac484dc140aac01eab5f51d11 (diff) |
video: s6e8ax0: Use devm_* APIs
devm_* APIs make the cleanup paths simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/exynos/s6e8ax0.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/video/exynos/s6e8ax0.c b/drivers/video/exynos/s6e8ax0.c index ca2602413aa4..29e70ed3f154 100644 --- a/drivers/video/exynos/s6e8ax0.c +++ b/drivers/video/exynos/s6e8ax0.c | |||
@@ -794,19 +794,18 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev) | |||
794 | return ret; | 794 | return ret; |
795 | } | 795 | } |
796 | 796 | ||
797 | lcd->ld = lcd_device_register("s6e8ax0", lcd->dev, lcd, | 797 | lcd->ld = devm_lcd_device_register(lcd->dev, "s6e8ax0", lcd->dev, lcd, |
798 | &s6e8ax0_lcd_ops); | 798 | &s6e8ax0_lcd_ops); |
799 | if (IS_ERR(lcd->ld)) { | 799 | if (IS_ERR(lcd->ld)) { |
800 | dev_err(lcd->dev, "failed to register lcd ops.\n"); | 800 | dev_err(lcd->dev, "failed to register lcd ops.\n"); |
801 | return PTR_ERR(lcd->ld); | 801 | return PTR_ERR(lcd->ld); |
802 | } | 802 | } |
803 | 803 | ||
804 | lcd->bd = backlight_device_register("s6e8ax0-bl", lcd->dev, lcd, | 804 | lcd->bd = devm_backlight_device_register(lcd->dev, "s6e8ax0-bl", |
805 | &s6e8ax0_backlight_ops, NULL); | 805 | lcd->dev, lcd, &s6e8ax0_backlight_ops, NULL); |
806 | if (IS_ERR(lcd->bd)) { | 806 | if (IS_ERR(lcd->bd)) { |
807 | dev_err(lcd->dev, "failed to register backlight ops.\n"); | 807 | dev_err(lcd->dev, "failed to register backlight ops.\n"); |
808 | ret = PTR_ERR(lcd->bd); | 808 | return PTR_ERR(lcd->bd); |
809 | goto err_backlight_register; | ||
810 | } | 809 | } |
811 | 810 | ||
812 | lcd->bd->props.max_brightness = MAX_BRIGHTNESS; | 811 | lcd->bd->props.max_brightness = MAX_BRIGHTNESS; |
@@ -834,10 +833,6 @@ static int s6e8ax0_probe(struct mipi_dsim_lcd_device *dsim_dev) | |||
834 | dev_dbg(lcd->dev, "probed s6e8ax0 panel driver.\n"); | 833 | dev_dbg(lcd->dev, "probed s6e8ax0 panel driver.\n"); |
835 | 834 | ||
836 | return 0; | 835 | return 0; |
837 | |||
838 | err_backlight_register: | ||
839 | lcd_device_unregister(lcd->ld); | ||
840 | return ret; | ||
841 | } | 836 | } |
842 | 837 | ||
843 | #ifdef CONFIG_PM | 838 | #ifdef CONFIG_PM |