From 4b26fb063b4e2596e5c4d76b363b19691a187102 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Wed, 11 Jul 2012 15:49:35 +0200 Subject: [PATCH] --- yaml --- r: 317971 b: refs/heads/master c: 013db67415d1914da2c438ab20d8d4bd4def1fa4 h: refs/heads/master i: 317969: cbcea5eb3caba325fc9a4eb2291ef4da2ea90182 317967: 8bf5ed8a1215a89c61224af7acdb25b1e742d707 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 27 +++++++++++-------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 6d46d2edd2f3..1bde3012f50b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4102d9f86d4d88f2bf150f3d073b789f35c9ac6b +refs/heads/master: 013db67415d1914da2c438ab20d8d4bd4def1fa4 diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index 4287a80b7388..3df73e7d6bdc 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -34,7 +34,7 @@ #include "sm7xx.h" -struct screen_info smtc_screen_info; +struct screen_info smtc_scr_info; /* * Private structure @@ -769,20 +769,17 @@ static int __init sm712vga_setup(char *options) if (!options || !*options) return -EINVAL; - smtc_screen_info.lfb_width = 0; - smtc_screen_info.lfb_height = 0; - smtc_screen_info.lfb_depth = 0; + smtc_scr_info.lfb_width = 0; + smtc_scr_info.lfb_height = 0; + smtc_scr_info.lfb_depth = 0; pr_debug("sm712vga_setup = %s\n", options); for (i = 0; i < ARRAY_SIZE(vesa_mode_table); i++) { if (strstr(options, vesa_mode_table[i].index)) { - smtc_screen_info.lfb_width = - vesa_mode_table[i].lfb_width; - smtc_screen_info.lfb_height = - vesa_mode_table[i].lfb_height; - smtc_screen_info.lfb_depth = - vesa_mode_table[i].lfb_depth; + smtc_scr_info.lfb_width = vesa_mode_table[i].lfb_width; + smtc_scr_info.lfb_height = vesa_mode_table[i].lfb_height; + smtc_scr_info.lfb_depth = vesa_mode_table[i].lfb_depth; return 0; } } @@ -820,11 +817,11 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev, sm7xx_init_hw(); - /*get mode parameter from smtc_screen_info */ - if (smtc_screen_info.lfb_width != 0) { - sfb->fb.var.xres = smtc_screen_info.lfb_width; - sfb->fb.var.yres = smtc_screen_info.lfb_height; - sfb->fb.var.bits_per_pixel = smtc_screen_info.lfb_depth; + /* get mode parameter from smtc_scr_info */ + if (smtc_scr_info.lfb_width != 0) { + sfb->fb.var.xres = smtc_scr_info.lfb_width; + sfb->fb.var.yres = smtc_scr_info.lfb_height; + sfb->fb.var.bits_per_pixel = smtc_scr_info.lfb_depth; } else { /* default resolution 1024x600 16bit mode */ sfb->fb.var.xres = SCREEN_X_RES;