Skip to content

Commit

Permalink
[PATCH] fbdev: nvidiafb: Driver cleanup
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Jan 10, 2006
1 parent 30420f8 commit c439e34
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/video/nvidia/nv_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static void nvidia_gpio_setscl(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;
u32 val;

Expand All @@ -64,7 +64,7 @@ static void nvidia_gpio_setsda(void *data, int state)

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;

Expand All @@ -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;

Expand Down
7 changes: 5 additions & 2 deletions drivers/video/nvidia/nvidia.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1515,7 +1515,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
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);
Expand Down Expand Up @@ -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) "
Expand Down

0 comments on commit c439e34

Please sign in to comment.