summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-12-25 11:42:06 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-12-25 11:42:06 +0000
commit80787cf0927a54f3cdfe663edda2e28927c7db84 (patch)
tree699fb100a53eebc0e5f1a5c4a4b4d80ddf7d729b /sys
parent2af882cf362e2c94b359bdcc131860a50d263710 (diff)
WSDISPLAYIO_GTYPE is u_int not int
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/armv7/omap/amdisplay.c4
-rw-r--r--sys/dev/fdt/simplefb.c4
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c2
-rw-r--r--sys/dev/pci/drm/i915/i915_drv.c2
-rw-r--r--sys/dev/pci/drm/radeon/radeon_kms.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armv7/omap/amdisplay.c b/sys/arch/armv7/omap/amdisplay.c
index dbeae388cb0..4332de22801 100644
--- a/sys/arch/armv7/omap/amdisplay.c
+++ b/sys/arch/armv7/omap/amdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdisplay.c,v 1.10 2019/05/06 03:45:58 mlarkin Exp $ */
+/* $OpenBSD: amdisplay.c,v 1.11 2019/12/25 11:42:05 jsg Exp $ */
/*
* Copyright (c) 2016 Ian Sutton <ians@openbsd.org>
*
@@ -590,7 +590,7 @@ amdisplay_ioctl(void *sconf, u_long cmd, caddr_t data, int flat, struct proc *p)
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(int *)data = WSDISPLAY_TYPE_UNKNOWN;
+ *(u_int *)data = WSDISPLAY_TYPE_UNKNOWN;
return 0;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;
diff --git a/sys/dev/fdt/simplefb.c b/sys/dev/fdt/simplefb.c
index 4da80a3dd28..5436bea9098 100644
--- a/sys/dev/fdt/simplefb.c
+++ b/sys/dev/fdt/simplefb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: simplefb.c,v 1.6 2019/10/13 17:00:54 kettenis Exp $ */
+/* $OpenBSD: simplefb.c,v 1.7 2019/12/25 11:42:05 jsg Exp $ */
/*
* Copyright (c) 2016 Mark Kettenis
*
@@ -243,7 +243,7 @@ simplefb_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
return ws_set_param(dp);
return -1;
case WSDISPLAYIO_GTYPE:
- *(int *)data = WSDISPLAY_TYPE_EFIFB;
+ *(u_int *)data = WSDISPLAY_TYPE_EFIFB;
return 0;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c
index 02a90069f8d..619e8289840 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_kms.c
@@ -1639,7 +1639,7 @@ amdgpu_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(int *)data = WSDISPLAY_TYPE_RADEONDRM;
+ *(u_int *)data = WSDISPLAY_TYPE_RADEONDRM;
return 0;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c
index 5f770610a69..fd7648b1ea2 100644
--- a/sys/dev/pci/drm/i915/i915_drv.c
+++ b/sys/dev/pci/drm/i915/i915_drv.c
@@ -3216,7 +3216,7 @@ inteldrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(int *)data = WSDISPLAY_TYPE_INTELDRM;
+ *(u_int *)data = WSDISPLAY_TYPE_INTELDRM;
return 0;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;
diff --git a/sys/dev/pci/drm/radeon/radeon_kms.c b/sys/dev/pci/drm/radeon/radeon_kms.c
index 9037e136db7..bef5501dbfb 100644
--- a/sys/dev/pci/drm/radeon/radeon_kms.c
+++ b/sys/dev/pci/drm/radeon/radeon_kms.c
@@ -222,7 +222,7 @@ radeondrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(int *)data = WSDISPLAY_TYPE_RADEONDRM;
+ *(u_int *)data = WSDISPLAY_TYPE_RADEONDRM;
return 0;
case WSDISPLAYIO_GINFO:
wdf = (struct wsdisplay_fbinfo *)data;