backlight: s6e63m0: remove unnecessary NULL deference check

Remove unnecessary NULL deference check, because it was already checked in
s6e63m0_probe().  Also, POWER_IS_ON is replaced with
s6e63m0_power_is_on().

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>

diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
index cff45152dee3506fc0401b440e5b7501bab85478..633f0d3fd6f7cf9c76bb68f75621be8c7ea6277c 100644 (file)
--- a/drivers/video/backlight/s6e63m0.c
+++ b/drivers/video/backlight/s6e63m0.c
@@ -43,8 +43,6 @@
 #define MIN_BRIGHTNESS         0
 #define MAX_BRIGHTNESS         10
 
-#define POWER_IS_ON(pwr)       ((pwr) <= FB_BLANK_NORMAL)
-
 struct s6e63m0 {
        struct device                   *dev;
        struct spi_device               *spi;
@@ -501,23 +499,19 @@ static int s6e63m0_ldi_disable(struct s6e63m0 *lcd)
        return ret;
 }
 
+static int s6e63m0_power_is_on(int power)
+{
+       return power <= FB_BLANK_NORMAL;
+}
+
 static int s6e63m0_power_on(struct s6e63m0 *lcd)
 {
        int ret = 0;
-       struct lcd_platform_data *pd = NULL;
-       struct backlight_device *bd = NULL;
+       struct lcd_platform_data *pd;
+       struct backlight_device *bd;
 
        pd = lcd->lcd_pd;
-       if (!pd) {
-               dev_err(lcd->dev, "platform data is NULL.\n");
-               return -EFAULT;
-       }
-
        bd = lcd->bd;
-       if (!bd) {
-               dev_err(lcd->dev, "backlight device is NULL.\n");
-               return -EFAULT;
-       }
 
        if (!pd->power_on) {
                dev_err(lcd->dev, "power_on is NULL.\n");
@@ -559,14 +553,10 @@ static int s6e63m0_power_on(struct s6e63m0 *lcd)
 
 static int s6e63m0_power_off(struct s6e63m0 *lcd)
 {
-       int ret = 0;
-       struct lcd_platform_data *pd = NULL;
+       int ret;
+       struct lcd_platform_data *pd;
 
        pd = lcd->lcd_pd;
-       if (!pd) {
-               dev_err(lcd->dev, "platform data is NULL.\n");
-               return -EFAULT;
-       }
 
        ret = s6e63m0_ldi_disable(lcd);
        if (ret) {
@@ -576,11 +566,7 @@ static int s6e63m0_power_off(struct s6e63m0 *lcd)
 
        msleep(pd->power_off_delay);
 
-       if (!pd->power_on) {
-               dev_err(lcd->dev, "power_on is NULL.\n");
-               return -EFAULT;
-       } else
-               pd->power_on(lcd->ld, 0);
+       pd->power_on(lcd->ld, 0);
 
        return 0;
 }
@@ -589,9 +575,9 @@ static int s6e63m0_power(struct s6e63m0 *lcd, int power)
 {
        int ret = 0;
 
-       if (POWER_IS_ON(power) && !POWER_IS_ON(lcd->power))
+       if (s6e63m0_power_is_on(power) && !s6e63m0_power_is_on(lcd->power))
                ret = s6e63m0_power_on(lcd);
-       else if (!POWER_IS_ON(power) && POWER_IS_ON(lcd->power))
+       else if (!s6e63m0_power_is_on(power) && s6e63m0_power_is_on(lcd->power))
                ret = s6e63m0_power_off(lcd);
 
        if (!ret)
@@ -812,8 +798,9 @@ static int s6e63m0_probe(struct spi_device *spi)
                lcd->power = FB_BLANK_POWERDOWN;
 
                s6e63m0_power(lcd, FB_BLANK_UNBLANK);
-       } else
+       } else {
                lcd->power = FB_BLANK_UNBLANK;
+       }
 
        dev_set_drvdata(&spi->dev, lcd);