Commit 7d345b22 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds

fbdev: nv: fix sparse noise

Mostly signedness fixes.  nv10_sim_state existence in both drivers suggests
that one of them should be removed, but that's for later.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Antonino A. Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7ce3ab10
...@@ -129,7 +129,7 @@ typedef struct { ...@@ -129,7 +129,7 @@ typedef struct {
int nvclk_khz; int nvclk_khz;
char mem_page_miss; char mem_page_miss;
char mem_latency; char mem_latency;
int memory_type; u32 memory_type;
int memory_width; int memory_width;
char enable_video; char enable_video;
char gr_during_vid; char gr_during_vid;
...@@ -719,7 +719,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk, ...@@ -719,7 +719,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
memctrl >>= 16; memctrl >>= 16;
if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) { if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
int dimm[3]; u32 dimm[3];
dev = pci_get_bus_and_slot(0, 2); dev = pci_get_bus_and_slot(0, 2);
pci_read_config_dword(dev, 0x40, &dimm[0]); pci_read_config_dword(dev, 0x40, &dimm[0]);
......
...@@ -265,12 +265,12 @@ static void nv10GetConfig(struct nvidia_par *par) ...@@ -265,12 +265,12 @@ static void nv10GetConfig(struct nvidia_par *par)
dev = pci_get_bus_and_slot(0, 1); dev = pci_get_bus_and_slot(0, 1);
if ((par->Chipset & 0xffff) == 0x01a0) { if ((par->Chipset & 0xffff) == 0x01a0) {
int amt = 0; u32 amt;
pci_read_config_dword(dev, 0x7c, &amt); pci_read_config_dword(dev, 0x7c, &amt);
par->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; par->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024;
} else if ((par->Chipset & 0xffff) == 0x01f0) { } else if ((par->Chipset & 0xffff) == 0x01f0) {
int amt = 0; u32 amt;
pci_read_config_dword(dev, 0x84, &amt); pci_read_config_dword(dev, 0x84, &amt);
par->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024; par->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024;
......
...@@ -158,7 +158,7 @@ unsigned long riva_get_memlen(struct riva_par *par) ...@@ -158,7 +158,7 @@ unsigned long riva_get_memlen(struct riva_par *par)
unsigned long memlen = 0; unsigned long memlen = 0;
unsigned int chipset = par->Chipset; unsigned int chipset = par->Chipset;
struct pci_dev* dev; struct pci_dev* dev;
int amt; u32 amt;
switch (chip->Architecture) { switch (chip->Architecture) {
case NV_ARCH_03: case NV_ARCH_03:
......
...@@ -231,7 +231,7 @@ typedef struct { ...@@ -231,7 +231,7 @@ typedef struct {
int nvclk_khz; int nvclk_khz;
char mem_page_miss; char mem_page_miss;
char mem_latency; char mem_latency;
int memory_type; u32 memory_type;
int memory_width; int memory_width;
char enable_video; char enable_video;
char gr_during_vid; char gr_during_vid;
...@@ -2107,7 +2107,7 @@ static void nv10GetConfig ...@@ -2107,7 +2107,7 @@ static void nv10GetConfig
) )
{ {
struct pci_dev* dev; struct pci_dev* dev;
int amt; u32 amt;
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
/* turn on big endian register access */ /* turn on big endian register access */
......
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