nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: bluedroid: Use conftest for pde_data

Browse Source 
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 <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3035747
(cherry picked from commit 2ce1e851bb)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3036782
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2023-12-15 12:42:24 +00:00
committed by mobile promotions
parent 1b537bff19
commit 7c4bfe82b2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/misc/bluedroid_pm.c
View File

@@ -1,5 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // 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 <nvidia/conftest.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/module.h> #include <linux/module.h>
@@ -13,7 +15,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/version.h>
#include "bluedroid_pm.h" #include "bluedroid_pm.h"
#define PROC_DIR "bluetooth/sleep" #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) loff_t *ppos)
{ {
char msg[50]; 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)); struct bluedroid_pm_data *bluedroid_pm = pde_data(file_inode(file));
#else #else
struct bluedroid_pm_data *bluedroid_pm = PDE_DATA(file_inode(file)); 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) size_t count, loff_t *ppos)
{ {
char *buf; 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)); struct bluedroid_pm_data *bluedroid_pm = pde_data(file_inode(file));
#else #else
struct bluedroid_pm_data *bluedroid_pm = PDE_DATA(file_inode(file)); struct bluedroid_pm_data *bluedroid_pm = PDE_DATA(file_inode(file));