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

Commit 25606e2f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: fix the printing of ipa resources"

parents 3861555c 5bb88ab3

drivers/platform/msm/ipa/ipa_v2/ipa_rm.c

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

/* Copyright (c) 2013-2016, 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
@@ -20,6 +20,7 @@ 
static const char *resource_name_to_str[IPA_RM_RESOURCE_MAX] = {

	__stringify(IPA_RM_RESOURCE_Q6_PROD),

	__stringify(IPA_RM_RESOURCE_USB_PROD),

	__stringify(IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD),

	__stringify(IPA_RM_RESOURCE_HSIC_PROD),

	__stringify(IPA_RM_RESOURCE_STD_ECM_PROD),

	__stringify(IPA_RM_RESOURCE_RNDIS_PROD),
@@ -29,6 +30,7 @@ static const char *resource_name_to_str[IPA_RM_RESOURCE_MAX] = { 
	__stringify(IPA_RM_RESOURCE_MHI_PROD),

	__stringify(IPA_RM_RESOURCE_Q6_CONS),

	__stringify(IPA_RM_RESOURCE_USB_CONS),

	__stringify(IPA_RM_RESOURCE_USB_DPL_CONS),

	__stringify(IPA_RM_RESOURCE_HSIC_CONS),

	__stringify(IPA_RM_RESOURCE_WLAN_CONS),

	__stringify(IPA_RM_RESOURCE_APPS_CONS),

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

+1 −1
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ static const char *ipa3_resource_name_to_str[IPA_RM_RESOURCE_MAX] = { 
	__stringify(IPA_RM_RESOURCE_MHI_PROD),

	__stringify(IPA_RM_RESOURCE_Q6_CONS),

	__stringify(IPA_RM_RESOURCE_USB_CONS),

	__stringify(IPA_RM_RESOURCE_USB_DPL_CONS),

	__stringify(IPA_RM_RESOURCE_HSIC_CONS),

	__stringify(IPA_RM_RESOURCE_WLAN_CONS),

	__stringify(IPA_RM_RESOURCE_APPS_CONS),

	__stringify(IPA_RM_RESOURCE_ODU_ADAPT_CONS),

	__stringify(IPA_RM_RESOURCE_MHI_CONS),

	__stringify(IPA_RM_RESOURCE_USB_DPL_CONS),

};



struct ipa3_rm_profile_vote_type {