Skip to content

media: intel/ipu7: guard ipu7_dir for in tree core builds #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aoli-al wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −4
Open

media: intel/ipu7: guard ipu7_dir for in tree core builds #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/media/pci/intel/ipu7/ipu7.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/list.h>
#include <linux/pci.h>
#include <linux/types.h>
#include <linux/version.h>

#include "ipu7-buttress.h"

Expand Down Expand Up @@ -81,7 +82,7 @@ struct ipu7_device {

void __iomem *base;
void __iomem *pb_base;
#ifdef CONFIG_DEBUG_FS
#if defined(CONFIG_DEBUG_FS) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 17, 0)
struct dentry *ipu7_dir;
#endif
u8 hw_ver;
Expand Down
8 changes: 5 additions & 3 deletions drivers/media/pci/intel/ipu7/psys/ipu-psys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,11 @@ static int ipu7_psys_init_debugfs(struct ipu7_psys *psys)
struct dentry *file;
struct dentry *dir;

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 17, 0)
dir = debugfs_create_dir("psys", psys->adev->isp->ipu7_dir);
#else
dir = debugfs_create_dir("ipu7-psys", NULL);
#endif
if (IS_ERR(dir))
return -ENOMEM;

Expand Down Expand Up @@ -1502,9 +1506,7 @@ static void ipu7_psys_remove(struct auxiliary_device *auxdev)

psys->adev->get_running_fw_task_count = NULL;
#ifdef CONFIG_DEBUG_FS
struct ipu7_device *isp = psys->adev->isp;

if (isp->ipu7_dir)
if (psys->debugfsdir)
debugfs_remove_recursive(psys->debugfsdir);
#endif

Expand Down