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

Commit d1a9d710 authored Mar 27, 2018 by Jani Nikula

drm: prefer inline over inline



Remove last users of __inline__.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180327204722.31246-1-jani.nikula@intel.com

parent 7056a2bc

include/drm/drmP.h

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -123,8 +123,7 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
	#define DRM_SWITCH_POWER_CHANGING 2		#define DRM_SWITCH_POWER_CHANGING 2
	#define DRM_SWITCH_POWER_DYNAMIC_OFF 3		#define DRM_SWITCH_POWER_DYNAMIC_OFF 3

	static __inline__ int drm_core_check_feature(struct drm_device *dev,		static inline int drm_core_check_feature(struct drm_device *dev, int feature)
	int feature)
	{		{
	return ((dev->driver->driver_features & feature) ? 1 : 0);		return ((dev->driver->driver_features & feature) ? 1 : 0);
	}		}
	@@ -143,7 +142,7 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev,
	/@}/		/@}/

	/* returns true if currently okay to sleep */		/* returns true if currently okay to sleep */
	static __inline__ bool drm_can_sleep(void)		static inline bool drm_can_sleep(void)
	{		{
	if (in_atomic() \|\| in_dbg_master() \|\| irqs_disabled())		if (in_atomic() \|\| in_dbg_master() \|\| irqs_disabled())
	return false;		return false;

include/drm/drm_legacy.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -194,7 +194,7 @@ void drm_legacy_ioremap(struct drm_local_map map, struct drm_device dev);
	void drm_legacy_ioremap_wc(struct drm_local_map map, struct drm_device dev);		void drm_legacy_ioremap_wc(struct drm_local_map map, struct drm_device dev);
	void drm_legacy_ioremapfree(struct drm_local_map map, struct drm_device dev);		void drm_legacy_ioremapfree(struct drm_local_map map, struct drm_device dev);

	static __inline__ struct drm_local_map drm_legacy_findmap(struct drm_device dev,		static inline struct drm_local_map drm_legacy_findmap(struct drm_device dev,
	unsigned int token)		unsigned int token)
	{		{
	struct drm_map_list *_entry;		struct drm_map_list *_entry;