Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee80a1d4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: Fix compilation errors when DEBUG_FS is disabled"

parents b7f12001 6c9a74ee

drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c

+9 −0
Original line number Diff line number Diff line
@@ -2924,7 +2924,16 @@ struct dentry *ipa_debugfs_get_root(void) 
EXPORT_SYMBOL(ipa_debugfs_get_root);



#else /* !CONFIG_DEBUG_FS */

#define INVALID_NO_OF_CHAR (-1)

void ipa3_debugfs_pre_init(void) {}

void ipa3_debugfs_post_init(void) {}

void ipa3_debugfs_remove(void) {}

int _ipa_read_ep_reg_v3_0(char *buf, int max_len, int pipe)

{

	return INVALID_NO_OF_CHAR;

}

int _ipa_read_ep_reg_v4_0(char *buf, int max_len, int pipe)

{

	return INVALID_NO_OF_CHAR;

}

#endif

drivers/platform/msm/ipa/test/ipa_ut_framework.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -931,7 +931,9 @@ static int ipa_ut_framework_init(void) 


	ipa_assert_on(!ipa_ut_ctx);



#ifdef CONFIG_DEBUG_FS

	ipa_ut_ctx->ipa_dbgfs_root = ipa_debugfs_get_root();

#endif

	if (!ipa_ut_ctx->ipa_dbgfs_root) {

		IPA_UT_ERR("No IPA debugfs root entry\n");

		return -EFAULT;