summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-07-09 16:07:27 -0700
committerIan Romanick <idr@us.ibm.com>2007-07-09 16:07:27 -0700
commita3f56dc3d0620633c7719a01e6e578661d65edfc (patch)
tree107f879afb4157b57133fc8ea8a2402d11a53537
parent2f2d8b9688743ac6367bf13c3c023310a257ceb7 (diff)
Adjust the types of the fields of xgi_aperture.
-rw-r--r--linux-core/xgi_drv.c10
-rw-r--r--linux-core/xgi_drv.h6
2 files changed, 7 insertions, 9 deletions
diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index 3608c747..2f0218e8 100644
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -252,8 +252,7 @@ int xgi_kern_probe(struct pci_dev *dev, const struct pci_device_id *id_table)
XGI_INFO("info->mmio.base: 0x%lx \n", info->mmio.base);
XGI_INFO("info->mmio.size: 0x%lx \n", info->mmio.size);
- info->mmio.vbase = (unsigned char *)ioremap_nocache(info->mmio.base,
- info->mmio.size);
+ info->mmio.vbase = ioremap_nocache(info->mmio.base, info->mmio.size);
if (!info->mmio.vbase) {
release_mem_region(info->mmio.base, info->mmio.size);
XGI_ERROR("info->mmio.vbase failed\n");
@@ -282,8 +281,7 @@ int xgi_kern_probe(struct pci_dev *dev, const struct pci_device_id *id_table)
goto error_disable_dev;
}
- info->fb.vbase = (unsigned char *)ioremap_nocache(info->fb.base,
- info->fb.size);
+ info->fb.vbase = ioremap_nocache(info->fb.base, info->fb.size);
if (!info->fb.vbase)
{
@@ -1484,11 +1482,11 @@ void __exit xgi_exit_module(void)
xgi_cmdlist_cleanup(&xgi_devices[i]);
if (xgi_devices[i].fb.vbase != NULL) {
- iounmap((void *)xgi_devices[i].fb.vbase);
+ iounmap(xgi_devices[i].fb.vbase);
xgi_devices[i].fb.vbase = NULL;
}
if (xgi_devices[i].mmio.vbase != NULL) {
- iounmap((void *)xgi_devices[i].mmio.vbase);
+ iounmap(xgi_devices[i].mmio.vbase);
xgi_devices[i].mmio.vbase = NULL;
}
//release_mem_region(xgi_devices[i].fb.base, xgi_devices[i].fb.size);
diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index 361a1e96..6bd04cd9 100644
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -94,9 +94,9 @@
#define XGI_CONTROL_DEVICE_NUMBER 100
struct xgi_aperture {
- U32 base; // pcie base is different from fb base
- U32 size;
- u8 *vbase;
+ unsigned long base;
+ unsigned int size;
+ void *vbase;
};
struct xgi_screen_info {