Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: [sparse] trivial sparse fixes

This should contain all the changes which require no thought to make
sparse happy.

Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Ben Widawsky and committed by
Daniel Vetter
c43b5634 df0323c4

+15 -7
+1 -1
drivers/gpu/drm/i915/i915_debugfs.c
··· 1832 1832 return 0; 1833 1833 } 1834 1834 1835 - int i915_forcewake_release(struct inode *inode, struct file *file) 1835 + static int i915_forcewake_release(struct inode *inode, struct file *file) 1836 1836 { 1837 1837 struct drm_device *dev = inode->i_private; 1838 1838 struct drm_i915_private *dev_priv = dev->dev_private;
+2
drivers/gpu/drm/i915/i915_drv.h
··· 1128 1128 extern void i915_driver_postclose(struct drm_device *dev, 1129 1129 struct drm_file *file_priv); 1130 1130 extern int i915_driver_device_is_agp(struct drm_device * dev); 1131 + #ifdef CONFIG_COMPAT 1131 1132 extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, 1132 1133 unsigned long arg); 1134 + #endif 1133 1135 extern int i915_emit_box(struct drm_device *dev, 1134 1136 struct drm_clip_rect *box, 1135 1137 int DR1, int DR4);
+4 -1
drivers/gpu/drm/i915/i915_ioc32.c
··· 34 34 #include "drmP.h" 35 35 #include "drm.h" 36 36 #include "i915_drm.h" 37 + #include "i915_drv.h" 37 38 38 39 typedef struct _drm_i915_batchbuffer32 { 39 40 int start; /* agp offset */ ··· 182 181 (unsigned long)request); 183 182 } 184 183 185 - drm_ioctl_compat_t *i915_compat_ioctls[] = { 184 + static drm_ioctl_compat_t *i915_compat_ioctls[] = { 186 185 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer, 187 186 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer, 188 187 [DRM_I915_GETPARAM] = compat_i915_getparam, ··· 190 189 [DRM_I915_ALLOC] = compat_i915_alloc 191 190 }; 192 191 192 + #ifdef CONFIG_COMPAT 193 193 /** 194 194 * Called whenever a 32-bit process running under a 64-bit kernel 195 195 * performs an ioctl on /dev/dri/card<n>. ··· 219 217 220 218 return ret; 221 219 } 220 + #endif
+2
drivers/gpu/drm/i915/i915_trace_points.c
··· 7 7 8 8 #include "i915_drv.h" 9 9 10 + #ifndef __CHECKER__ 10 11 #define CREATE_TRACE_POINTS 11 12 #include "i915_trace.h" 13 + #endif
+1
drivers/gpu/drm/i915/intel_acpi.c
··· 9 9 #include <acpi/acpi_drivers.h> 10 10 11 11 #include "drmP.h" 12 + #include "i915_drv.h" 12 13 13 14 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ 14 15
+1 -1
drivers/gpu/drm/i915/intel_display.c
··· 9503 9503 void (*hook)(struct drm_device *dev); 9504 9504 }; 9505 9505 9506 - struct intel_quirk intel_quirks[] = { 9506 + static struct intel_quirk intel_quirks[] = { 9507 9507 /* HP Mini needs pipe A force quirk (LP: #322104) */ 9508 9508 { 0x27ae, 0x103c, 0x361a, quirk_pipea_force }, 9509 9509
+1 -1
drivers/gpu/drm/i915/intel_fb.c
··· 94 94 mutex_lock(&dev->struct_mutex); 95 95 96 96 /* Flush everything out, we'll be doing GTT only from now on */ 97 - ret = intel_pin_and_fence_fb_obj(dev, obj, false); 97 + ret = intel_pin_and_fence_fb_obj(dev, obj, NULL); 98 98 if (ret) { 99 99 DRM_ERROR("failed to pin fb: %d\n", ret); 100 100 goto out_unref;
+2 -2
drivers/gpu/drm/i915/intel_ringbuffer.c
··· 891 891 return ret; 892 892 } 893 893 894 - int intel_init_ring_buffer(struct drm_device *dev, 895 - struct intel_ring_buffer *ring) 894 + static int intel_init_ring_buffer(struct drm_device *dev, 895 + struct intel_ring_buffer *ring) 896 896 { 897 897 struct drm_i915_gem_object *obj; 898 898 int ret;
+1 -1
drivers/gpu/drm/i915/intel_sdvo.c
··· 1258 1258 dev_priv->crt_ddc_pin)); 1259 1259 } 1260 1260 1261 - enum drm_connector_status 1261 + static enum drm_connector_status 1262 1262 intel_sdvo_tmds_sink_detect(struct drm_connector *connector) 1263 1263 { 1264 1264 struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);