Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c43b5634 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: [sparse] trivial sparse fixes 



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

Signed-off-by: default avatarBen Widawsky <benjamin.widawsky@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent df0323c4

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1832,7 +1832,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) 
	return 0;

}



int i915_forcewake_release(struct inode *inode, struct file *file)

static int i915_forcewake_release(struct inode *inode, struct file *file)

{

	struct drm_device *dev = inode->i_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1128,8 +1128,10 @@ extern void i915_driver_preclose(struct drm_device *dev, 
extern void i915_driver_postclose(struct drm_device *dev,

				  struct drm_file *file_priv);

extern int i915_driver_device_is_agp(struct drm_device * dev);

#ifdef CONFIG_COMPAT

extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);

#endif

extern int i915_emit_box(struct drm_device *dev,

			 struct drm_clip_rect *box,

			 int DR1, int DR4);

drivers/gpu/drm/i915/i915_ioc32.c

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "drmP.h"

#include "drm.h"

#include "i915_drm.h"

#include "i915_drv.h"



typedef struct _drm_i915_batchbuffer32 {

	int start;		/* agp offset */
@@ -181,7 +182,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd, 
			 (unsigned long)request);

}



drm_ioctl_compat_t *i915_compat_ioctls[] = {

static drm_ioctl_compat_t *i915_compat_ioctls[] = {

	[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,

	[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,

	[DRM_I915_GETPARAM] = compat_i915_getparam,
@@ -189,6 +190,7 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = { 
	[DRM_I915_ALLOC] = compat_i915_alloc

};



#ifdef CONFIG_COMPAT

/**

 * Called whenever a 32-bit process running under a 64-bit kernel

 * performs an ioctl on /dev/dri/card<n>.
@@ -217,3 +219,4 @@ long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 


	return ret;

}

#endif

drivers/gpu/drm/i915/i915_trace_points.c

+2 −0
Original line number Diff line number Diff line
@@ -7,5 +7,7 @@ 


#include "i915_drv.h"



#ifndef __CHECKER__

#define CREATE_TRACE_POINTS

#include "i915_trace.h"

#endif

drivers/gpu/drm/i915/intel_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <acpi/acpi_drivers.h>



#include "drmP.h"

#include "i915_drv.h"



#define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */