backlight: ams369fg06: remove unnecessary NULL deference check
Remove unnecessary NULL deference check, because it was already checked in ams369fg06_probe(). Also, unnecessary parentheses are removed in ams369fg06_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>
This commit is contained in:
Родитель
5197643616
Коммит
66ecc11dfc
|
@ -314,26 +314,17 @@ static int ams369fg06_ldi_disable(struct ams369fg06 *lcd)
|
|||
|
||||
static int ams369fg06_power_is_on(int power)
|
||||
{
|
||||
return ((power) <= FB_BLANK_NORMAL);
|
||||
return power <= FB_BLANK_NORMAL;
|
||||
}
|
||||
|
||||
static int ams369fg06_power_on(struct ams369fg06 *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");
|
||||
|
@ -375,14 +366,10 @@ static int ams369fg06_power_on(struct ams369fg06 *lcd)
|
|||
|
||||
static int ams369fg06_power_off(struct ams369fg06 *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 = ams369fg06_ldi_disable(lcd);
|
||||
if (ret) {
|
||||
|
@ -392,11 +379,7 @@ static int ams369fg06_power_off(struct ams369fg06 *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;
|
||||
}
|
||||
|
@ -535,8 +518,9 @@ static int ams369fg06_probe(struct spi_device *spi)
|
|||
lcd->power = FB_BLANK_POWERDOWN;
|
||||
|
||||
ams369fg06_power(lcd, FB_BLANK_UNBLANK);
|
||||
} else
|
||||
} else {
|
||||
lcd->power = FB_BLANK_UNBLANK;
|
||||
}
|
||||
|
||||
dev_set_drvdata(&spi->dev, lcd);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче