aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-04-28 05:15:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:40 -0400
commit7d345b2253f92804948d66f4db17a49c1932b9a3 (patch)
tree676bde686170e6c569cf6752fde7da3d803dfc14 /drivers/video/nvidia
parent7ce3ab100e4e115ca2c4fd931844a0f1a50df406 (diff)
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: Alexey Dobriyan <adobriyan@gmail.com> Cc: Antonino A. Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/nvidia')
-rw-r--r--drivers/video/nvidia/nv_hw.c4
-rw-r--r--drivers/video/nvidia/nv_setup.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/nvidia/nv_hw.c b/drivers/video/nvidia/nv_hw.c
index d1a10549f543..ed20a9871b33 100644
--- a/drivers/video/nvidia/nv_hw.c
+++ b/drivers/video/nvidia/nv_hw.c
@@ -129,7 +129,7 @@ typedef struct {
129 int nvclk_khz; 129 int nvclk_khz;
130 char mem_page_miss; 130 char mem_page_miss;
131 char mem_latency; 131 char mem_latency;
132 int memory_type; 132 u32 memory_type;
133 int memory_width; 133 int memory_width;
134 char enable_video; 134 char enable_video;
135 char gr_during_vid; 135 char gr_during_vid;
@@ -719,7 +719,7 @@ static void nForceUpdateArbitrationSettings(unsigned VClk,
719 memctrl >>= 16; 719 memctrl >>= 16;
720 720
721 if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) { 721 if ((memctrl == 0x1A9) || (memctrl == 0x1AB) || (memctrl == 0x1ED)) {
722 int dimm[3]; 722 u32 dimm[3];
723 723
724 dev = pci_get_bus_and_slot(0, 2); 724 dev = pci_get_bus_and_slot(0, 2);
725 pci_read_config_dword(dev, 0x40, &dimm[0]); 725 pci_read_config_dword(dev, 0x40, &dimm[0]);
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 82579d3a9970..d9627b57eb4d 100644
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -265,12 +265,12 @@ static void nv10GetConfig(struct nvidia_par *par)
265 265
266 dev = pci_get_bus_and_slot(0, 1); 266 dev = pci_get_bus_and_slot(0, 1);
267 if ((par->Chipset & 0xffff) == 0x01a0) { 267 if ((par->Chipset & 0xffff) == 0x01a0) {
268 int amt = 0; 268 u32 amt;
269 269
270 pci_read_config_dword(dev, 0x7c, &amt); 270 pci_read_config_dword(dev, 0x7c, &amt);
271 par->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024; 271 par->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024;
272 } else if ((par->Chipset & 0xffff) == 0x01f0) { 272 } else if ((par->Chipset & 0xffff) == 0x01f0) {
273 int amt = 0; 273 u32 amt;
274 274
275 pci_read_config_dword(dev, 0x84, &amt); 275 pci_read_config_dword(dev, 0x84, &amt);
276 par->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024; 276 par->RamAmountKBytes = (((amt >> 4) & 127) + 1) * 1024;