From 1a45e366db75a74bb5f7be7158af7de2f1eef754 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 19 Dec 2023 08:24:14 +0000 Subject: [PATCH] pwm: Use conftest to find if pwm_ops has config Use conftest to determine if pwm_ops struct has config callback or not. This call back is deprecated from commit 0829c35dc534 ("pwm: Drop support for legacy drivers") in Linux 6.0. Bug 4387902 Change-Id: I83e0ad5edcb44ad9f84e7573287c338bd1137176 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3037919 Reviewed-by: Shardar Mohammed GVS: Gerrit_Virtual_Submit --- drivers/media/platform/tegra/cdi/cdi_pwm.c | 5 ++--- drivers/media/platform/tegra/isc/isc_pwm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/tegra/cdi/cdi_pwm.c b/drivers/media/platform/tegra/cdi/cdi_pwm.c index fb851a2c..625b5445 100644 --- a/drivers/media/platform/tegra/cdi/cdi_pwm.c +++ b/drivers/media/platform/tegra/cdi/cdi_pwm.c @@ -9,7 +9,6 @@ #include #include #include -#include #include "cdi-pwm-priv.h" @@ -33,7 +32,7 @@ static inline struct cdi_pwm_info *to_cdi_pwm_info(struct pwm_chip *chip) return container_of(chip, struct cdi_pwm_info, chip); } -#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE +#if defined(NV_PWM_OPS_STRUCT_HAS_CONFIG) /* Linux 6.0 */ static int cdi_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) { struct cdi_pwm_info *info = to_cdi_pwm_info(chip); @@ -127,7 +126,7 @@ static struct pwm_device *of_cdi_pwm_xlate(struct pwm_chip *pc, } static const struct pwm_ops cdi_pwm_ops = { -#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE +#if defined(NV_PWM_OPS_STRUCT_HAS_CONFIG) /* Linux 6.0 */ .config = cdi_pwm_config, .enable = cdi_pwm_enable, .disable = cdi_pwm_disable, diff --git a/drivers/media/platform/tegra/isc/isc_pwm.c b/drivers/media/platform/tegra/isc/isc_pwm.c index ae40ab54..97b464c1 100644 --- a/drivers/media/platform/tegra/isc/isc_pwm.c +++ b/drivers/media/platform/tegra/isc/isc_pwm.c @@ -9,7 +9,6 @@ #include #include #include -#include #include "isc-pwm-priv.h" @@ -33,7 +32,7 @@ static inline struct isc_pwm_info *to_isc_pwm_info(struct pwm_chip *chip) return container_of(chip, struct isc_pwm_info, chip); } -#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE +#if defined(NV_PWM_OPS_STRUCT_HAS_CONFIG) /* Linux 6.0 */ static int isc_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) { struct isc_pwm_info *info = to_isc_pwm_info(chip); @@ -127,7 +126,7 @@ static struct pwm_device *of_isc_pwm_xlate(struct pwm_chip *pc, } static const struct pwm_ops isc_pwm_ops = { -#if KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE +#if defined(NV_PWM_OPS_STRUCT_HAS_CONFIG) /* Linux 6.0 */ .config = isc_pwm_config, .enable = isc_pwm_enable, .disable = isc_pwm_disable,