From 7c4bfe82b2d3555ea7540dfdba660a3b8b6815b0 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Fri, 15 Dec 2023 12:42:24 +0000 Subject: [PATCH] misc: bluedroid: Use conftest for pde_data Conftest has a test for checking if the 'pde_data' function is lower or upper case. Update the bluedroid driver to use conftest for this. Bug 4346767 Change-Id: I1f54b9b560b171a6b2ccf5304e13f5e76fbbfacb Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3035747 (cherry picked from commit 2ce1e851bb435f97b15bfc855268beeb6e1cc77d) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3036782 Reviewed-by: svcacv Reviewed-by: Laxman Dewangan GVS: Gerrit_Virtual_Submit --- drivers/misc/bluedroid_pm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/misc/bluedroid_pm.c b/drivers/misc/bluedroid_pm.c index 74390f07..6c2ce738 100644 --- a/drivers/misc/bluedroid_pm.c +++ b/drivers/misc/bluedroid_pm.c @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved */ +// SPDX-FileCopyrightText: Copyright (C) 2019-2023 NVIDIA CORPORATION. All rights reserved. + +#include #include #include @@ -13,7 +15,6 @@ #include #include #include -#include #include "bluedroid_pm.h" #define PROC_DIR "bluetooth/sleep" @@ -209,7 +210,7 @@ static ssize_t lpm_read_proc(struct file *file, char __user *buf, size_t size, loff_t *ppos) { char msg[50]; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) +#if defined(NV_PDE_DATA_LOWER_CASE_PRESENT) /* Linux v5.17 */ struct bluedroid_pm_data *bluedroid_pm = pde_data(file_inode(file)); #else struct bluedroid_pm_data *bluedroid_pm = PDE_DATA(file_inode(file)); @@ -225,7 +226,7 @@ static ssize_t lpm_write_proc(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) { char *buf; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) +#if defined(NV_PDE_DATA_LOWER_CASE_PRESENT) /* Linux v5.17 */ struct bluedroid_pm_data *bluedroid_pm = pde_data(file_inode(file)); #else struct bluedroid_pm_data *bluedroid_pm = PDE_DATA(file_inode(file));