diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-05-05 12:33:40 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:42:11 -0400 |
commit | ebe5e12d00f4785092a9650845ad3451bbf4b311 (patch) | |
tree | eed293be3bd1f90ede0505d35364d4f5768c4569 /drivers/video/sh_mobile_lcdcfb.c | |
parent | 69843ba7f24950f8ef5dadacfbfbd08f53e3455b (diff) |
fbdev: sh_mobile_lcdc: remove runtime PM calls from the notifier
The notifier function calls sh_mobile_lcdc_stop() and
sh_mobile_lcdc_start(), which already take care about the runtime PM
state. Remove redundant calls.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 466834c604da..04f226093158 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -1288,7 +1288,6 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb, | |||
1288 | struct fb_info *info = event->info; | 1288 | struct fb_info *info = event->info; |
1289 | struct sh_mobile_lcdc_chan *ch = info->par; | 1289 | struct sh_mobile_lcdc_chan *ch = info->par; |
1290 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; | 1290 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; |
1291 | int ret; | ||
1292 | 1291 | ||
1293 | if (&ch->lcdc->notifier != nb) | 1292 | if (&ch->lcdc->notifier != nb) |
1294 | return NOTIFY_DONE; | 1293 | return NOTIFY_DONE; |
@@ -1302,7 +1301,6 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb, | |||
1302 | board_cfg->display_off(board_cfg->board_data); | 1301 | board_cfg->display_off(board_cfg->board_data); |
1303 | module_put(board_cfg->owner); | 1302 | module_put(board_cfg->owner); |
1304 | } | 1303 | } |
1305 | pm_runtime_put(info->device); | ||
1306 | sh_mobile_lcdc_stop(ch->lcdc); | 1304 | sh_mobile_lcdc_stop(ch->lcdc); |
1307 | break; | 1305 | break; |
1308 | case FB_EVENT_RESUME: | 1306 | case FB_EVENT_RESUME: |
@@ -1316,9 +1314,7 @@ static int sh_mobile_lcdc_notify(struct notifier_block *nb, | |||
1316 | module_put(board_cfg->owner); | 1314 | module_put(board_cfg->owner); |
1317 | } | 1315 | } |
1318 | 1316 | ||
1319 | ret = sh_mobile_lcdc_start(ch->lcdc); | 1317 | sh_mobile_lcdc_start(ch->lcdc); |
1320 | if (!ret) | ||
1321 | pm_runtime_get_sync(info->device); | ||
1322 | } | 1318 | } |
1323 | 1319 | ||
1324 | return NOTIFY_OK; | 1320 | return NOTIFY_OK; |