|
@@ -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_DYNAMIC_OFF 3
|
|
|
|
|
|
-static __inline__ int drm_core_check_feature(struct drm_device *dev,
|
|
|
- int feature)
|
|
|
+static inline int drm_core_check_feature(struct drm_device *dev, int feature)
|
|
|
{
|
|
|
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 */
|
|
|
-static __inline__ bool drm_can_sleep(void)
|
|
|
+static inline bool drm_can_sleep(void)
|
|
|
{
|
|
|
if (in_atomic() || in_dbg_master() || irqs_disabled())
|
|
|
return false;
|