From 32b339d9fcdccb1a16c2c98abf2bf6200992ba96 Mon Sep 17 00:00:00 2001 From: Mihail Atanassov Date: Tue, 17 Sep 2019 15:05:08 +0000 Subject: [PATCH] drm/komeda: Remove in-code use of ifdef Provide a dummy static inline function in the header instead. Cc: Daniel Vetter Cc: Lowry Li (Arm Technology China) Cc: james qian wang (Arm Technology China) Fixes: 4d74b25ee395 ("drm/komeda: Adds error event print functionality") Signed-off-by: Mihail Atanassov Reviewed-by: Daniel Vetter Reviewed-by: James Qian Wang (Arm Technology China) Signed-off-by: james qian wang (Arm Technology China) Link: https://patchwork.freedesktop.org/patch/msgid/20190917150314.20892-1-mihail.atanassov@arm.com --- drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 2 ++ drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h index e28e7e6563ab..8acf8c0601cc 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.h +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.h @@ -220,6 +220,8 @@ struct komeda_dev *dev_to_mdev(struct device *dev); #ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT void komeda_print_events(struct komeda_events *evts); +#else +static inline void komeda_print_events(struct komeda_events *evts) {} #endif #endif /*_KOMEDA_DEV_H_*/ diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 18d7e2520225..dc85c08e614d 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -47,9 +47,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) memset(&evts, 0, sizeof(evts)); status = mdev->funcs->irq_handler(mdev, &evts); -#ifdef CONFIG_DRM_KOMEDA_ERROR_PRINT komeda_print_events(&evts); -#endif /* Notify the crtc to handle the events */ for (i = 0; i < kms->n_crtcs; i++) -- 2.11.0