UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fbdev: da8xx: remove panel_power_ctrl() callback from platform data 

There are no more users of panel_power_ctrl(). Remove it from the
driver.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
This commit is contained in:
Bartosz Golaszewski 2019-07-22 15:44:20 +02:00 committed by Sekhar Nori
parent 9c65754cd3
commit 3fca9e0be9
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/video/fbdev/da8xx-fb.c
View File

@ -165,7 +165,6 @@ struct da8xx_fb_par {
struct notifier_block freq_transition; struct notifier_block freq_transition;
#endif #endif
unsigned int lcdc_clk_rate; unsigned int lcdc_clk_rate;
void (*panel_power_ctrl)(int);
struct regulator *lcd_supply; struct regulator *lcd_supply;
u32 pseudo_palette[16]; u32 pseudo_palette[16];
struct fb_videomode mode; struct fb_videomode mode;
@ -1076,9 +1075,7 @@ static int fb_remove(struct platform_device *dev)
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
lcd_da8xx_cpufreq_deregister(par); lcd_da8xx_cpufreq_deregister(par);
#endif #endif
if (par->panel_power_ctrl) { if (par->lcd_supply) {
par->panel_power_ctrl(0);
} else if (par->lcd_supply) {
ret = regulator_disable(par->lcd_supply); ret = regulator_disable(par->lcd_supply);
if (ret) if (ret)
return ret; return ret;
@ -1187,9 +1184,7 @@ static int cfb_blank(int blank, struct fb_info *info)
case FB_BLANK_UNBLANK: case FB_BLANK_UNBLANK:
lcd_enable_raster(); lcd_enable_raster();
if (par->panel_power_ctrl) { if (par->lcd_supply) {
par->panel_power_ctrl(1);
} else if (par->lcd_supply) {
ret = regulator_enable(par->lcd_supply); ret = regulator_enable(par->lcd_supply);
if (ret) if (ret)
return ret; return ret;
@ -1199,9 +1194,7 @@ static int cfb_blank(int blank, struct fb_info *info)
case FB_BLANK_VSYNC_SUSPEND: case FB_BLANK_VSYNC_SUSPEND:
case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_HSYNC_SUSPEND:
case FB_BLANK_POWERDOWN: case FB_BLANK_POWERDOWN:
if (par->panel_power_ctrl) { if (par->lcd_supply) {
par->panel_power_ctrl(0);
} else if (par->lcd_supply) {
ret = regulator_disable(par->lcd_supply); ret = regulator_disable(par->lcd_supply);
if (ret) if (ret)
return ret; return ret;
@ -1413,10 +1406,6 @@ static int fb_probe(struct platform_device *device)
par->dev = &device->dev; par->dev = &device->dev;
par->lcdc_clk = tmp_lcdc_clk; par->lcdc_clk = tmp_lcdc_clk;
par->lcdc_clk_rate = clk_get_rate(par->lcdc_clk); par->lcdc_clk_rate = clk_get_rate(par->lcdc_clk);
if (fb_pdata->panel_power_ctrl) {
par->panel_power_ctrl = fb_pdata->panel_power_ctrl;
par->panel_power_ctrl(1);
}
par->lcd_supply = devm_regulator_get_optional(&device->dev, "lcd"); par->lcd_supply = devm_regulator_get_optional(&device->dev, "lcd");
if (IS_ERR(par->lcd_supply)) { if (IS_ERR(par->lcd_supply)) {
@ -1638,9 +1627,7 @@ static int fb_suspend(struct device *dev)
int ret; int ret;
console_lock(); console_lock();
if (par->panel_power_ctrl) { if (par->lcd_supply) {
par->panel_power_ctrl(0);
} else if (par->lcd_supply) {
ret = regulator_disable(par->lcd_supply); ret = regulator_disable(par->lcd_supply);
if (ret) if (ret)
return ret; return ret;
@ -1666,9 +1653,7 @@ static int fb_resume(struct device *dev)
if (par->blank == FB_BLANK_UNBLANK) { if (par->blank == FB_BLANK_UNBLANK) {
lcd_enable_raster(); lcd_enable_raster();
if (par->panel_power_ctrl) { if (par->lcd_supply) {
par->panel_power_ctrl(1);
} else if (par->lcd_supply) {
ret = regulator_enable(par->lcd_supply); ret = regulator_enable(par->lcd_supply);
if (ret) if (ret)
return ret; return ret;

1
include/video/da8xx-fb.h
View File

@ -32,7 +32,6 @@ struct da8xx_lcdc_platform_data {
const char manu_name[10]; const char manu_name[10];
void *controller_data; void *controller_data;
const char type[25]; const char type[25];
void (*panel_power_ctrl)(int);
}; };
struct lcd_ctrl_config { struct lcd_ctrl_config {