From bb736d8f3c5707923a014d0986187bc12182b478 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 4 Jun 2015 06:11:21 +0000 Subject: [PATCH] Switch intel_gmbus_is_port_valid and intel_gmbus_is_forced_bit from extern inline back to static inline so the kernel will build on compilers that default to c99 inline semantics. --- sys/dev/pci/drm/i915/i915_drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index ecec03e0aa9..f436a20c52c 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.62 2015/04/18 11:41:28 jsg Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.63 2015/06/04 06:11:21 jsg Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -1748,7 +1748,7 @@ void i915_teardown_sysfs(struct drm_device *dev_priv); /* intel_i2c.c */ extern int intel_setup_gmbus(struct drm_device *dev); extern void intel_teardown_gmbus(struct drm_device *dev); -extern inline bool intel_gmbus_is_port_valid(unsigned port) +static inline bool intel_gmbus_is_port_valid(unsigned port) { return (port >= GMBUS_PORT_SSC && port <= GMBUS_PORT_DPD); } @@ -1757,7 +1757,7 @@ extern struct i2c_controller *intel_gmbus_get_adapter( struct drm_i915_private *dev_priv, unsigned port); extern void intel_gmbus_set_speed(struct i2c_controller *adapter, int speed); extern void intel_gmbus_force_bit(struct i2c_controller *adapter, bool force_bit); -extern inline bool intel_gmbus_is_forced_bit(struct i2c_controller *i2c) +static inline bool intel_gmbus_is_forced_bit(struct i2c_controller *i2c) { return container_of(i2c, struct intel_gmbus, controller)->force_bit; } -- 2.20.1