diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-11 16:59:04 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 17:40:49 -0400 |
commit | 018882aa66f5110478edc14e6c3fecc2b46ca0c0 (patch) | |
tree | af28c376103c290cc17f4dab05af92f46365e076 /drivers | |
parent | aa7b5b0b2db6d33a8104e411cb74c15a4983b286 (diff) |
fbdev: sh_mobile_lcdc: Remove board configuration board_data field
The field is unused, remove it. Update board code accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index a899b6df46cc..c54eb973de28 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
@@ -315,14 +315,12 @@ static void sh_mobile_lcdc_deferred_io(struct fb_info *info, | |||
315 | /* trigger panel update */ | 315 | /* trigger panel update */ |
316 | dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE); | 316 | dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE); |
317 | if (bcfg->start_transfer) | 317 | if (bcfg->start_transfer) |
318 | bcfg->start_transfer(bcfg->board_data, ch, | 318 | bcfg->start_transfer(ch, &sh_mobile_lcdc_sys_bus_ops); |
319 | &sh_mobile_lcdc_sys_bus_ops); | ||
320 | lcdc_write_chan(ch, LDSM2R, LDSM2R_OSTRG); | 319 | lcdc_write_chan(ch, LDSM2R, LDSM2R_OSTRG); |
321 | dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE); | 320 | dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE); |
322 | } else { | 321 | } else { |
323 | if (bcfg->start_transfer) | 322 | if (bcfg->start_transfer) |
324 | bcfg->start_transfer(bcfg->board_data, ch, | 323 | bcfg->start_transfer(ch, &sh_mobile_lcdc_sys_bus_ops); |
325 | &sh_mobile_lcdc_sys_bus_ops); | ||
326 | lcdc_write_chan(ch, LDSM2R, LDSM2R_OSTRG); | 324 | lcdc_write_chan(ch, LDSM2R, LDSM2R_OSTRG); |
327 | } | 325 | } |
328 | } | 326 | } |
@@ -346,7 +344,7 @@ static void sh_mobile_lcdc_display_on(struct sh_mobile_lcdc_chan *ch) | |||
346 | 344 | ||
347 | /* HDMI must be enabled before LCDC configuration */ | 345 | /* HDMI must be enabled before LCDC configuration */ |
348 | if (board_cfg->display_on) | 346 | if (board_cfg->display_on) |
349 | board_cfg->display_on(board_cfg->board_data, ch->info); | 347 | board_cfg->display_on(); |
350 | } | 348 | } |
351 | 349 | ||
352 | static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch) | 350 | static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch) |
@@ -354,7 +352,7 @@ static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch) | |||
354 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; | 352 | struct sh_mobile_lcdc_board_cfg *board_cfg = &ch->cfg.board_cfg; |
355 | 353 | ||
356 | if (board_cfg->display_off) | 354 | if (board_cfg->display_off) |
357 | board_cfg->display_off(board_cfg->board_data); | 355 | board_cfg->display_off(); |
358 | 356 | ||
359 | if (ch->tx_dev) | 357 | if (ch->tx_dev) |
360 | ch->tx_dev->ops->display_off(ch->tx_dev); | 358 | ch->tx_dev->ops->display_off(ch->tx_dev); |
@@ -697,7 +695,7 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) | |||
697 | 695 | ||
698 | board_cfg = &ch->cfg.board_cfg; | 696 | board_cfg = &ch->cfg.board_cfg; |
699 | if (board_cfg->setup_sys) { | 697 | if (board_cfg->setup_sys) { |
700 | ret = board_cfg->setup_sys(board_cfg->board_data, ch, | 698 | ret = board_cfg->setup_sys(ch, |
701 | &sh_mobile_lcdc_sys_bus_ops); | 699 | &sh_mobile_lcdc_sys_bus_ops); |
702 | if (ret) | 700 | if (ret) |
703 | return ret; | 701 | return ret; |
@@ -1326,7 +1324,7 @@ static int sh_mobile_lcdc_update_bl(struct backlight_device *bdev) | |||
1326 | bdev->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) | 1324 | bdev->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) |
1327 | brightness = 0; | 1325 | brightness = 0; |
1328 | 1326 | ||
1329 | return cfg->set_brightness(cfg->board_data, brightness); | 1327 | return cfg->set_brightness(brightness); |
1330 | } | 1328 | } |
1331 | 1329 | ||
1332 | static int sh_mobile_lcdc_get_brightness(struct backlight_device *bdev) | 1330 | static int sh_mobile_lcdc_get_brightness(struct backlight_device *bdev) |
@@ -1334,7 +1332,7 @@ static int sh_mobile_lcdc_get_brightness(struct backlight_device *bdev) | |||
1334 | struct sh_mobile_lcdc_chan *ch = bl_get_data(bdev); | 1332 | struct sh_mobile_lcdc_chan *ch = bl_get_data(bdev); |
1335 | struct sh_mobile_lcdc_board_cfg *cfg = &ch->cfg.board_cfg; | 1333 | struct sh_mobile_lcdc_board_cfg *cfg = &ch->cfg.board_cfg; |
1336 | 1334 | ||
1337 | return cfg->get_brightness(cfg->board_data); | 1335 | return cfg->get_brightness(); |
1338 | } | 1336 | } |
1339 | 1337 | ||
1340 | static int sh_mobile_lcdc_check_fb(struct backlight_device *bdev, | 1338 | static int sh_mobile_lcdc_check_fb(struct backlight_device *bdev, |