From: "Antonino A. Daplas" - remove redundant casts - add mode_option to module parameter Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- drivers/video/nvidia/nv_i2c.c | 6 +++--- drivers/video/nvidia/nvidia.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff -puN drivers/video/nvidia/nv_i2c.c~fbdev-nvidiafb-driver-cleanup drivers/video/nvidia/nv_i2c.c --- devel/drivers/video/nvidia/nv_i2c.c~fbdev-nvidiafb-driver-cleanup 2005-12-22 05:10:06.000000000 -0800 +++ devel-akpm/drivers/video/nvidia/nv_i2c.c 2005-12-22 05:10:06.000000000 -0800 @@ -46,7 +46,7 @@ static void nvidia_gpio_setscl(void *dat static void nvidia_gpio_setsda(void *data, int state) { - struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; + struct nvidia_i2c_chan *chan = data; struct nvidia_par *par = chan->par; u32 val; @@ -64,7 +64,7 @@ static void nvidia_gpio_setsda(void *dat static int nvidia_gpio_getscl(void *data) { - struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; + struct nvidia_i2c_chan *chan = data; struct nvidia_par *par = chan->par; u32 val = 0; @@ -79,7 +79,7 @@ static int nvidia_gpio_getscl(void *data static int nvidia_gpio_getsda(void *data) { - struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; + struct nvidia_i2c_chan *chan = data; struct nvidia_par *par = chan->par; u32 val = 0; diff -puN drivers/video/nvidia/nvidia.c~fbdev-nvidiafb-driver-cleanup drivers/video/nvidia/nvidia.c --- devel/drivers/video/nvidia/nvidia.c~fbdev-nvidiafb-driver-cleanup 2005-12-22 05:10:06.000000000 -0800 +++ devel-akpm/drivers/video/nvidia/nvidia.c 2005-12-22 05:10:06.000000000 -0800 @@ -485,7 +485,7 @@ static int nvidia_backlight_levels[] = { static int nvidia_set_backlight_enable(int on, int level, void *data) { - struct nvidia_par *par = (struct nvidia_par *)data; + struct nvidia_par *par = data; u32 tmp_pcrt, tmp_pmc, fpcontrol; tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; @@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(stru if (!info) goto err_out; - par = (struct nvidia_par *)info->par; + par = info->par; par->pci_dev = pd; info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); @@ -1811,6 +1811,9 @@ module_param(vram, int, 0); MODULE_PARM_DESC(vram, "amount of framebuffer memory to remap in MiB" "(default=0 - remap entire memory)"); +module_param(mode_option, charp, 0); +MODULE_PARM_DESC(mode_option, "Specify initial video mode"); + #ifdef CONFIG_MTRR module_param(nomtrr, bool, 0); MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " _