From mboxrd@z Thu Jan 1 00:00:00 1970 From: dl9pf@gmx.de Subject: [PATCH] [TRIVIAL] v2: Fix declaration of intel_gmbus_{is_forced_bit/is_port_falid} in i915 driver. Date: Mon, 6 May 2013 14:52:08 +0200 Message-ID: <1367844728-30302-1-git-send-email-dl9pf@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: linux-kernel-owner@vger.kernel.org To: dl9pf@gmx.de Cc: pageexec@freemail.hu, daniel.vetter@ffwll.ch, airlied@linux.ie, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org =46rom: Jan-Simon M=C3=B6ller 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 p= atch was developed by PaX Team . This is respin of this patch. Signed-off-by: Jan-Simon M=C3=B6ller CC: pageexec@freemail.hu CC: daniel.vetter@ffwll.ch CC: airlied@linux.ie CC: intel-gfx@lists.freedesktop.org CC: dri-devel@lists.freedesktop.org CC: linux-kernel@vger.kernel.org --- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i91= 5_drv.h index 3ac71db..b41c49d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1806,7 +1806,7 @@ void i915_teardown_sysfs(struct drm_device *dev_p= riv); /* 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 >=3D GMBUS_PORT_SSC && port <=3D GMBUS_PORT_DPD); } @@ -1815,7 +1815,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapte= r( struct drm_i915_private *dev_priv, unsigned port); extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int spe= ed); extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool fo= rce_bit); -extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapt= er) +static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapt= er) { return container_of(adapter, struct intel_gmbus, adapter)->force_bit; } --=20 1.8.1.4