diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-11-29 14:33:41 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 22:40:55 +0100 |
| commit | 93ff259846a774ff37dca54792c5a3a6425882c0 (patch) | |
| tree | b5bbdb3005ec0dc57f674c1c88de5abede17c65f /drivers/video/sh_mobile_lcdcfb.c | |
| parent | fbdev: sh_mobile_lcdc: Store display mode in a struct fb_videomode (diff) | |
| download | linux-93ff259846a774ff37dca54792c5a3a6425882c0.tar.xz linux-93ff259846a774ff37dca54792c5a3a6425882c0.zip | |
fbdev: sh_mobile_lcdc: Rename (lcd|num)_cfg (lcd|num)_modes
The struct sh_mobile_lcdc_chan_cfg platform data contains a list of
video modes. Name the lcd_cfg and num_cfg fields to reflect that they
describe video modes.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 422fcfd3cf28..ab7b17975846 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -1191,8 +1191,8 @@ static int sh_mobile_check_var(struct fb_var_screeninfo *var, struct fb_info *in * distance between two modes is defined as the size of the * non-overlapping parts of the two rectangles. */ - for (i = 0; i < ch->cfg.num_cfg; ++i) { - const struct fb_videomode *mode = &ch->cfg.lcd_cfg[i]; + for (i = 0; i < ch->cfg.num_modes; ++i) { + const struct fb_videomode *mode = &ch->cfg.lcd_modes[i]; unsigned int dist; /* We can only round up. */ @@ -1211,7 +1211,7 @@ static int sh_mobile_check_var(struct fb_var_screeninfo *var, struct fb_info *in } /* If no available mode can be used, return an error. */ - if (ch->cfg.num_cfg != 0) { + if (ch->cfg.num_modes != 0) { if (best_dist == (unsigned int)-1) return -EINVAL; @@ -1671,7 +1671,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv, struct fb_var_screeninfo *var; struct fb_info *info; unsigned int max_size; - int num_cfg; + int num_modes; void *buf; int ret; int i; @@ -1698,7 +1698,7 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv, max_mode = NULL; max_size = 0; - for (i = 0, mode = cfg->lcd_cfg; i < cfg->num_cfg; i++, mode++) { + for (i = 0, mode = cfg->lcd_modes; i < cfg->num_modes; i++, mode++) { unsigned int size = mode->yres * mode->xres; /* NV12/NV21 buffers must have even number of lines */ @@ -1722,15 +1722,15 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv, max_mode->xres, max_mode->yres); /* Create the mode list. */ - if (cfg->lcd_cfg == NULL) { + if (cfg->lcd_modes == NULL) { mode = &default_720p; - num_cfg = 1; + num_modes = 1; } else { - mode = cfg->lcd_cfg; - num_cfg = cfg->num_cfg; + mode = cfg->lcd_modes; + num_modes = cfg->num_modes; } - fb_videomode_to_modelist(mode, num_cfg, &info->modelist); + fb_videomode_to_modelist(mode, num_modes, &info->modelist); /* Initialize the transmitter device if present. */ if (cfg->tx_dev) { |