diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2006-01-09 23:53:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:44 -0500 |
commit | c439e345425434f07df333083794fc8864cee9ca (patch) | |
tree | fb03b4105601a175b5adccdeebd137e2e8fe9e6c /drivers/video/nvidia | |
parent | 30420f8f464975f7f26e8195f60569dfed6ac060 (diff) |
[PATCH] fbdev: nvidiafb: Driver cleanup
- remove redundant casts
- add mode_option to module parameter
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r-- | drivers/video/nvidia/nv_i2c.c | 6 | ||||
-rw-r--r-- | drivers/video/nvidia/nvidia.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index fa724720e769..bd9eca05e146 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c | |||
@@ -46,7 +46,7 @@ static void nvidia_gpio_setscl(void *data, int state) | |||
46 | 46 | ||
47 | static void nvidia_gpio_setsda(void *data, int state) | 47 | static void nvidia_gpio_setsda(void *data, int state) |
48 | { | 48 | { |
49 | struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; | 49 | struct nvidia_i2c_chan *chan = data; |
50 | struct nvidia_par *par = chan->par; | 50 | struct nvidia_par *par = chan->par; |
51 | u32 val; | 51 | u32 val; |
52 | 52 | ||
@@ -64,7 +64,7 @@ static void nvidia_gpio_setsda(void *data, int state) | |||
64 | 64 | ||
65 | static int nvidia_gpio_getscl(void *data) | 65 | static int nvidia_gpio_getscl(void *data) |
66 | { | 66 | { |
67 | struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; | 67 | struct nvidia_i2c_chan *chan = data; |
68 | struct nvidia_par *par = chan->par; | 68 | struct nvidia_par *par = chan->par; |
69 | u32 val = 0; | 69 | u32 val = 0; |
70 | 70 | ||
@@ -79,7 +79,7 @@ static int nvidia_gpio_getscl(void *data) | |||
79 | 79 | ||
80 | static int nvidia_gpio_getsda(void *data) | 80 | static int nvidia_gpio_getsda(void *data) |
81 | { | 81 | { |
82 | struct nvidia_i2c_chan *chan = (struct nvidia_i2c_chan *)data; | 82 | struct nvidia_i2c_chan *chan = data; |
83 | struct nvidia_par *par = chan->par; | 83 | struct nvidia_par *par = chan->par; |
84 | u32 val = 0; | 84 | u32 val = 0; |
85 | 85 | ||
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index f6d2440e84aa..dcf2e7a7d215 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c | |||
@@ -485,7 +485,7 @@ static int nvidia_backlight_levels[] = { | |||
485 | 485 | ||
486 | static int nvidia_set_backlight_enable(int on, int level, void *data) | 486 | static int nvidia_set_backlight_enable(int on, int level, void *data) |
487 | { | 487 | { |
488 | struct nvidia_par *par = (struct nvidia_par *)data; | 488 | struct nvidia_par *par = data; |
489 | u32 tmp_pcrt, tmp_pmc, fpcontrol; | 489 | u32 tmp_pcrt, tmp_pmc, fpcontrol; |
490 | 490 | ||
491 | tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; | 491 | tmp_pmc = NV_RD32(par->PMC, 0x10F0) & 0x0000FFFF; |
@@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, | |||
1515 | if (!info) | 1515 | if (!info) |
1516 | goto err_out; | 1516 | goto err_out; |
1517 | 1517 | ||
1518 | par = (struct nvidia_par *)info->par; | 1518 | par = info->par; |
1519 | par->pci_dev = pd; | 1519 | par->pci_dev = pd; |
1520 | 1520 | ||
1521 | info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); | 1521 | info->pixmap.addr = kmalloc(8 * 1024, GFP_KERNEL); |
@@ -1811,6 +1811,9 @@ module_param(vram, int, 0); | |||
1811 | MODULE_PARM_DESC(vram, | 1811 | MODULE_PARM_DESC(vram, |
1812 | "amount of framebuffer memory to remap in MiB" | 1812 | "amount of framebuffer memory to remap in MiB" |
1813 | "(default=0 - remap entire memory)"); | 1813 | "(default=0 - remap entire memory)"); |
1814 | module_param(mode_option, charp, 0); | ||
1815 | MODULE_PARM_DESC(mode_option, "Specify initial video mode"); | ||
1816 | |||
1814 | #ifdef CONFIG_MTRR | 1817 | #ifdef CONFIG_MTRR |
1815 | module_param(nomtrr, bool, 0); | 1818 | module_param(nomtrr, bool, 0); |
1816 | MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " | 1819 | MODULE_PARM_DESC(nomtrr, "Disables MTRR support (0 or 1=disabled) " |