diff options
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 8 | ||||
-rw-r--r-- | include/video/sh_mobile_lcdc.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index a2e0903466b3..a899b6df46cc 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -345,20 +345,16 @@ static void sh_mobile_lcdc_display_on(struct sh_mobile_lcdc_chan *ch) | |||
345 | } | 345 | } |
346 | 346 | ||
347 | /* HDMI must be enabled before LCDC configuration */ | 347 | /* HDMI must be enabled before LCDC configuration */ |
348 | if (board_cfg->display_on && try_module_get(board_cfg->owner)) { | 348 | if (board_cfg->display_on) |
349 | board_cfg->display_on(board_cfg->board_data, ch->info); | 349 | board_cfg->display_on(board_cfg->board_data, ch->info); |
350 | module_put(board_cfg->owner); | ||
351 | } | ||
352 | } | 350 | } |
353 | 351 | ||
354 | static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch) | 352 | static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch) |
355 | { | 353 | { |
356 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; | 354 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; |
357 | 355 | ||
358 | if (board_cfg->display_off && try_module_get(board_cfg->owner)) { | 356 | if (board_cfg->display_off) |
359 | board_cfg->display_off(board_cfg->board_data); | 357 | board_cfg->display_off(board_cfg->board_data); |
360 | module_put(board_cfg->owner); | ||
361 | } | ||
362 | 358 | ||
363 | if (ch->tx_dev) | 359 | if (ch->tx_dev) |
364 | ch->tx_dev->ops->display_off(ch->tx_dev); | 360 | ch->tx_dev->ops->display_off(ch->tx_dev); |
diff --git a/include/video/sh_mobile_lcdc.h b/include/video/sh_mobile_lcdc.h index 3681cf62a88d..163f4b704bf9 100644 --- a/include/video/sh_mobile_lcdc.h +++ b/include/video/sh_mobile_lcdc.h | |||
@@ -147,9 +147,7 @@ struct sh_mobile_lcdc_sys_bus_ops { | |||
147 | unsigned long (*read_data)(void *handle); | 147 | unsigned long (*read_data)(void *handle); |
148 | }; | 148 | }; |
149 | 149 | ||
150 | struct module; | ||
151 | struct sh_mobile_lcdc_board_cfg { | 150 | struct sh_mobile_lcdc_board_cfg { |
152 | struct module *owner; | ||
153 | void *board_data; | 151 | void *board_data; |
154 | int (*setup_sys)(void *board_data, void *sys_ops_handle, | 152 | int (*setup_sys)(void *board_data, void *sys_ops_handle, |
155 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); | 153 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); |