From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933499AbdKBLWD (ORCPT ); Thu, 2 Nov 2017 07:22:03 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:50885 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933349AbdKBLV7 (ORCPT ); Thu, 2 Nov 2017 07:21:59 -0400 From: Arnd Bergmann To: Rob Clark , David Airlie Cc: Arnd Bergmann , Jordan Crouse , Daniel Vetter , Eric Anholt , Archit Taneja , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/msm: fix msm_rd_dump_submit prototype Date: Thu, 2 Nov 2017 12:21:32 +0100 Message-Id: <20171102112145.4086005-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:pA8W5RYcPNsusP+VPa0wxkrAvJCQ9e9GDJGVxkTWuc5XjbhLujM Gxk9paXJ2tsDSHC1puMN/UXzS7/fgLLtB79hA0hmLXClI4UB3JdJs5kOHQBiFXp10e5MDwA rQvNBXi33tiSVMTI2+imCB5mS0Q5baKwUzSq5TP7ZoGo8OhFb+EWxyjEMSCUo7YXNhCR8A+ sMlTDYPrX0ZO/z9VVvKlw== X-UI-Out-Filterresults: notjunk:1;V01:K0:5tUmNZWyB4c=:riAtxbVOHvUAa5h62hudUz U3jpqptp41Jj96jgC4E8Qc5EcLvjaJb1TjufwVl4wkyD5gjnNEB9deyVwakpZIyFqTq9LVisR eXSFrg27RcFQS8cdlOXUwfZO0dLsuyvJ4WfBTScK63QhLpxUjEXGWaBuYRsj77fKLTjWGfSUI /8SlUZ5ynPUsCayZ/R8GWaAKcqAx3MnOhwqWFp4exawhkjZkUFiWu2zaToriYGdsFB0hhwIOA ahiMIx4mTZoQkGaKDoaQG3A6LFPhQku4VCg2W0v14ow6yB19tftRTUa9+AXXNsf8o3BdaSsR7 jGp3QTUbSq8iC6pI2dFXUMWjBJbEgJWlnzVVSVIGeX2W6dxUj1GNnZar0Bb0RG7cASwBERFSQ tauQSCURXdAFIcTLWw1T8TQrIOwERyH4s7n2M2WJHwhxzZDSdG4jZY9TfTlGxrX1HYWbQH28D Dp7CsIMSibuRnQyQzfzjWnWTTx8Zf0/+XamifvEc61dBpRgR8JYfjbbeYnMKyABZZdvpS7iPa Lh5Dm9E+yPIip0IOOhtEN/zjiQE8IkmboEZIDaG1PlLfswKgv1RVA/is4PdBUrTLd0FPABsgO dqK82qyENVuvsP6XWVZhDhRNSqfVfI6+GmJ001ScxR8AQ5Xq3P4EjvW4eaJKpf8ysYS0rmOjb OF/clbwmE5ZbcWAIxz0kE+PxK8X4cKBgz5fZWkcFKakkdNR9et+kIJpqi2Pyf9FGCnfIJr6YO Zxm9yfA/rqvjpTpGsOe4DBrZzyagGjuiyq+Jcg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The prototype of msm_rd_dump_submit() has recently changed. However, we have two declarations of this functions, and the other one remains the old version, leading to this: drivers/gpu/drm/msm/msm_gpu.c: In function 'recover_worker': drivers/gpu/drm/msm/msm_gpu.c:295:23: error: passing argument 1 of 'msm_rd_dump_submit' from incompatible pointer type [-Werror=incompatible-pointer-types] This changes the second one to match the first again. Fixes: 2165e2b9cba2 ("drm/msm: split rd debugfs file") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/msm/msm_drv.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index c646843d8822..0a653dd2e618 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -303,7 +303,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor); void msm_perf_debugfs_cleanup(struct msm_drm_private *priv); #else static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; } -static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {} +static inline void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, + const char *fmt, ...) {} static inline void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) {} static inline void msm_perf_debugfs_cleanup(struct msm_drm_private *priv) {} #endif -- 2.9.0