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

Commit 61a381ac 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: change ipa_rm resource names"

parents d39add80 2bf40dd7

drivers/platform/msm/ipa/ipa_rm.c

+6 −8
Original line number Diff line number Diff line
@@ -19,22 +19,20 @@ 
#include "ipa_rm_resource.h"



static const char *resource_name_to_str[IPA_RM_RESOURCE_MAX] = {

	__stringify(IPA_RM_RESOURCE_BRIDGE_PROD),

	__stringify(IPA_RM_RESOURCE_Q6_PROD),

	__stringify(IPA_RM_RESOURCE_USB_PROD),

	__stringify(IPA_RM_RESOURCE_HSIC_PROD),

	__stringify(IPA_RM_RESOURCE_STD_ECM_PROD),

	__stringify(IPA_RM_RESOURCE_RNDIS_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_0_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_1_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_2_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_3_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_4_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_5_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_6_PROD),

	__stringify(IPA_RM_RESOURCE_WWAN_7_PROD),

	__stringify(IPA_RM_RESOURCE_ODU_PROD),

	__stringify(IPA_RM_RESOURCE_ODU_BRIDGE_PROD),

	__stringify(IPA_RM_RESOURCE_WLAN_PROD),

	__stringify(IPA_RM_RESOURCE_Q6_CONS),

	__stringify(IPA_RM_RESOURCE_USB_CONS),

	__stringify(IPA_RM_RESOURCE_HSIC_CONS),

	__stringify(IPA_RM_RESOURCE_WLAN_CONS),

	__stringify(IPA_RM_RESOURCE_APPS_CONS),

};



struct ipa_rm_profile_vote_type {

drivers/platform/msm/ipa/ipa_rm_resource.c

+8 −8
Original line number Diff line number Diff line
@@ -29,19 +29,14 @@ int ipa_rm_prod_index(enum ipa_rm_resource_name resource_name) 
	int result = resource_name;



	switch (resource_name) {

	case IPA_RM_RESOURCE_BRIDGE_PROD:

	case IPA_RM_RESOURCE_Q6_PROD:

	case IPA_RM_RESOURCE_USB_PROD:

	case IPA_RM_RESOURCE_HSIC_PROD:

	case IPA_RM_RESOURCE_STD_ECM_PROD:

	case IPA_RM_RESOURCE_RNDIS_PROD:

	case IPA_RM_RESOURCE_WWAN_0_PROD:

	case IPA_RM_RESOURCE_WWAN_1_PROD:

	case IPA_RM_RESOURCE_WWAN_2_PROD:

	case IPA_RM_RESOURCE_WWAN_3_PROD:

	case IPA_RM_RESOURCE_WWAN_4_PROD:

	case IPA_RM_RESOURCE_WWAN_5_PROD:

	case IPA_RM_RESOURCE_WWAN_6_PROD:

	case IPA_RM_RESOURCE_WWAN_7_PROD:

	case IPA_RM_RESOURCE_ODU_PROD:

	case IPA_RM_RESOURCE_ODU_BRIDGE_PROD:

	case IPA_RM_RESOURCE_WLAN_PROD:

		break;

	default:
@@ -64,14 +59,19 @@ int ipa_rm_prod_index(enum ipa_rm_resource_name resource_name) 
int ipa_rm_cons_index(enum ipa_rm_resource_name resource_name)

{

	int result = resource_name;



	switch (resource_name) {

	case IPA_RM_RESOURCE_Q6_CONS:

	case IPA_RM_RESOURCE_USB_CONS:

	case IPA_RM_RESOURCE_HSIC_CONS:

	case IPA_RM_RESOURCE_WLAN_CONS:

	case IPA_RM_RESOURCE_APPS_CONS:

		break;

	default:

		result = IPA_RM_INDEX_INVALID;

		break;

	}



	return result;

}

include/uapi/linux/msm_ipa.h

+7 −9
Original line number Diff line number Diff line
@@ -232,24 +232,22 @@ enum ipa_ecm_event { 
 */

enum ipa_rm_resource_name {

	IPA_RM_RESOURCE_PROD = 0,

	IPA_RM_RESOURCE_BRIDGE_PROD = IPA_RM_RESOURCE_PROD,

	IPA_RM_RESOURCE_Q6_PROD = IPA_RM_RESOURCE_PROD,

	IPA_RM_RESOURCE_USB_PROD,

	IPA_RM_RESOURCE_HSIC_PROD,

	IPA_RM_RESOURCE_STD_ECM_PROD,

	IPA_RM_RESOURCE_RNDIS_PROD,

	IPA_RM_RESOURCE_WWAN_0_PROD,

	IPA_RM_RESOURCE_WWAN_1_PROD,

	IPA_RM_RESOURCE_WWAN_2_PROD,

	IPA_RM_RESOURCE_WWAN_3_PROD,

	IPA_RM_RESOURCE_WWAN_4_PROD,

	IPA_RM_RESOURCE_WWAN_5_PROD,

	IPA_RM_RESOURCE_WWAN_6_PROD,

	IPA_RM_RESOURCE_WWAN_7_PROD,

	IPA_RM_RESOURCE_ODU_PROD,

	IPA_RM_RESOURCE_ODU_BRIDGE_PROD,

	IPA_RM_RESOURCE_WLAN_PROD,

	IPA_RM_RESOURCE_PROD_MAX,



	IPA_RM_RESOURCE_USB_CONS = IPA_RM_RESOURCE_PROD_MAX,

	IPA_RM_RESOURCE_Q6_CONS = IPA_RM_RESOURCE_PROD_MAX,

	IPA_RM_RESOURCE_USB_CONS,

	IPA_RM_RESOURCE_HSIC_CONS,

	IPA_RM_RESOURCE_WLAN_CONS,

	IPA_RM_RESOURCE_APPS_CONS,

	IPA_RM_RESOURCE_MAX

};