Commit c439e345 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds

[PATCH] fbdev: nvidiafb: Driver cleanup

- remove redundant casts
- add mode_option to module parameter
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 30420f8f
...@@ -46,7 +46,7 @@ static void nvidia_gpio_setscl(void *data, int state) ...@@ -46,7 +46,7 @@ static void nvidia_gpio_setscl(void *data, int state)
static void nvidia_gpio_setsda(void *data, int state) 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; struct nvidia_par *par = chan->par;
u32 val; u32 val;
...@@ -64,7 +64,7 @@ static void nvidia_gpio_setsda(void *data, int state) ...@@ -64,7 +64,7 @@ static void nvidia_gpio_setsda(void *data, int state)
static int nvidia_gpio_getscl(void *data) 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; struct nvidia_par *par = chan->par;
u32 val = 0; u32 val = 0;
...@@ -79,7 +79,7 @@ static int nvidia_gpio_getscl(void *data) ...@@ -79,7 +79,7 @@ static int nvidia_gpio_getscl(void *data)
static int nvidia_gpio_getsda(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; struct nvidia_par *par = chan->par;
u32 val = 0; u32 val = 0;
......
...@@ -485,7 +485,7 @@ static int nvidia_backlight_levels[] = { ...@@ -485,7 +485,7 @@ static int nvidia_backlight_levels[] = {
static int nvidia_set_backlight_enable(int on, int level, void *data) 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; u32 tmp_pcrt, tmp_pmc, fpcontrol;
tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF;
...@@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, ...@@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
if (!info) if (!info)
goto err_out; goto err_out;
par = (struct nvidia_par *)info->par; par = info->par;
par->pci_dev = pd; par->pci_dev = pd;
info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL);
...@@ -1811,6 +1811,9 @@ module_param(vram, int, 0); ...@@ -1811,6 +1811,9 @@ module_param(vram, int, 0);
MODULE_PARM_DESC(vram, MODULE_PARM_DESC(vram,
"amount of framebuffer memory to remap in MiB" "amount of framebuffer memory to remap in MiB"
"(default=0 - remap entire memory)"); "(default=0 - remap entire memory)");
module_param(mode_option, charp, 0);
MODULE_PARM_DESC(mode_option, "Specify initial video mode");
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
module_param(nomtrr, bool, 0); module_param(nomtrr, bool, 0);
MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment