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

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

+4 -5
+2 -3
include/drm/drmP.h
··· 123 123 #define DRM_SWITCH_POWER_CHANGING 2 124 124 #define DRM_SWITCH_POWER_DYNAMIC_OFF 3 125 125 126 - static __inline__ int drm_core_check_feature(struct drm_device *dev, 127 - int feature) 126 + static inline int drm_core_check_feature(struct drm_device *dev, int feature) 128 127 { 129 128 return ((dev->driver->driver_features & feature) ? 1 : 0); 130 129 } ··· 142 143 /*@}*/ 143 144 144 145 /* returns true if currently okay to sleep */ 145 - static __inline__ bool drm_can_sleep(void) 146 + static inline bool drm_can_sleep(void) 146 147 { 147 148 if (in_atomic() || in_dbg_master() || irqs_disabled()) 148 149 return false;
+2 -2
include/drm/drm_legacy.h
··· 194 194 void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); 195 195 void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev); 196 196 197 - static __inline__ struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, 198 - unsigned int token) 197 + static inline struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, 198 + unsigned int token) 199 199 { 200 200 struct drm_map_list *_entry; 201 201 list_for_each_entry(_entry, &dev->maplist, head)