mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-22 09:11:26 +03:00
drivers: Add conftest test for class_create
In Linux v6.4, the module pointer argument is removed from the class_create() function. Add a test to the conftest script that checks if this argument for the class_create() function has been removed and use the definition created by conftest to select which version of the function is used. Bug 4183168 Bug 4221847 Change-Id: I440e4b318001886cd0319bb3499ba33178475e8c Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2989020 Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
86dafc35bb
commit
ce678a37b1
@@ -1,5 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2015-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
|
||||
#include <nvidia/conftest.h>
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/module.h>
|
||||
@@ -1875,7 +1878,11 @@ static int cdi_mgr_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* poluate sysfs entries */
|
||||
#if defined(NV_CLASS_CREATE_HAS_NO_OWNER_ARG) /* Linux v6.4 */
|
||||
cdi_mgr->cdi_class = class_create(cdi_mgr->devname);
|
||||
#else
|
||||
cdi_mgr->cdi_class = class_create(THIS_MODULE, cdi_mgr->devname);
|
||||
#endif
|
||||
if (IS_ERR(cdi_mgr->cdi_class)) {
|
||||
err = PTR_ERR(cdi_mgr->cdi_class);
|
||||
cdi_mgr->cdi_class = NULL;
|
||||
|
||||
Reference in New Issue
Block a user