v2: Fix declaration of intel_gmbus_{is_forced_bit/is_port_falid} in i915 driver.
Subsystems (2)
PATCH 1/1 v2: Fix declaration of intel_gmbus_{is_forced_bit/is_port_falid} in i915 driver.
From: Jan-Simon Möller <[email protected]>
20130509: v2: (re-)add inline upon request.
Description:intel_gmbus_is_forced_bit is no extern as its body is right below. Likewise for intel_gmbus_is_port_valid.
This fixes a compilation issue with clang. An initial version of this patch was developed by PaX Team <pageexec at freemail.hu>.
This is respin of this patch.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -1806,7 +1806,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 ); }
@@ -1815,7 +1815,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter( struct drm_i915_private *dev_priv, unsigned port);extern void intel_gmbus_set_speed (struct i2c_adapter *adapter,int speed);extern void intel_gmbus_force_bit (struct i2c_adapter *adapter,bool force_bit); -extern inline bool intel_gmbus_is_forced_bit (struct i2c_adapter *adapter) +static inline bool intel_gmbus_is_forced_bit (struct i2c_adapter *adapter) { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; }
Signature · 1 line
1.8.1.4
Daniel Vetter
AppliedQuoted 12 lines · On Mon, May 06, 2013 at 02:52:08PM +0200, [email protected] wrote:
From: Jan-Simon Möller <[email protected]>
20130509: v2: (re-)add inline upon request.
Description:
intel_gmbus_is_forced_bitis no extern as its body is right below. Likewise forintel_gmbus_is_port_valid.This fixes a compilation issue with clang. An initial version of this patch was developed by PaX Team <pageexec at freemail.hu>.
This is respin of this patch.
Quoted 7 lines
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch