summaryrefslogtreecommitdiff
path: root/lib/intel_mmio.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-09 23:42:19 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-01-09 23:42:19 +0100
commit1be3fd7eeed3adf1fba56edc37110d346b03b88b (patch)
tree73ca9fb6927b3f1c33ae520e585a6b25fc0a9ca5 /lib/intel_mmio.c
parentbd811d2d39f49087310be508e2ea6278e817d6f1 (diff)
lib: fixup new compiler warnings
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'lib/intel_mmio.c')
-rw-r--r--lib/intel_mmio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c
index da68bdf3..e2f254d1 100644
--- a/lib/intel_mmio.c
+++ b/lib/intel_mmio.c
@@ -83,7 +83,7 @@ intel_get_mmio(struct pci_device *pci_dev)
{
uint32_t devid;
int mmio_bar;
- int err;
+ int error;
devid = pci_dev->device_id;
if (IS_GEN2(devid))
@@ -91,15 +91,15 @@ intel_get_mmio(struct pci_device *pci_dev)
else
mmio_bar = 0;
- err = pci_device_map_range (pci_dev,
+ error = pci_device_map_range (pci_dev,
pci_dev->regions[mmio_bar].base_addr,
pci_dev->regions[mmio_bar].size,
PCI_DEV_MAP_FLAG_WRITABLE,
&mmio);
- if (err != 0) {
+ if (error != 0) {
fprintf(stderr, "Couldn't map MMIO region: %s\n",
- strerror(err));
+ strerror(error));
exit(1);
}
}
@@ -109,7 +109,7 @@ intel_get_mmio(struct pci_device *pci_dev)
* updated with the correct path.
*/
static int
-find_debugfs_path(char *dri_base)
+find_debugfs_path(const char *dri_base)
{
char buf[FILENAME_MAX];
struct stat sb;