Merge "Revert "msm: ipa4: fix client register and deregister for usb"" (48de0416) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ static int calculate_throughput(void)
		struct ipa_pm_client *client;

		/* Create a basic array to hold throughputs*/
		for (i = 1, n = 0; i < IPA_PM_MAX_CLIENTS; i++) {
		for (i = 0, n = 0; i < IPA_PM_MAX_CLIENTS; i++) {
		client = ipa_pm_ctx->clients[i];
		if (client != NULL && IPA_PM_STATE_ACTIVE(client->state)) {
		/* default case */
		@@ -498,8 +498,7 @@ static int find_next_open_array_element(const char *name)

		n = -ENOBUFS;

		/* 0 is not a valid handle */
		for (i = IPA_PM_MAX_CLIENTS - 1; i >= 1; i--) {
		for (i = IPA_PM_MAX_CLIENTS - 1; i >= 0; i--) {
		if (ipa_pm_ctx->clients[i] == NULL) {
		n = i;
		continue;
		@@ -1064,7 +1063,7 @@ int ipa_pm_deactivate_all_deferred(void)
		return -EINVAL;
		}

		for (i = 1; i < IPA_PM_MAX_CLIENTS; i++) {
		for (i = 0; i < IPA_PM_MAX_CLIENTS; i++) {
		client = ipa_pm_ctx->clients[i];

		if (client == NULL)
		@@ -1305,7 +1304,7 @@ int ipa_pm_stat(char *buf, int size)
		cnt += result;


		for (i = 1; i < IPA_PM_MAX_CLIENTS; i++) {
		for (i = 0; i < IPA_PM_MAX_CLIENTS; i++) {
		client = ipa_pm_ctx->clients[i];

		if (client == NULL)

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018, 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
		@@ -16,7 +16,7 @@
		#include <linux/msm_ipa.h>

		/* internal to ipa */
		#define IPA_PM_MAX_CLIENTS 32 /* actual max is value -1 since we start from 1*/
		#define IPA_PM_MAX_CLIENTS 12 /* actual max is value -1 since we start from 1*/
		#define IPA_PM_MAX_EX_CL 64
		#define IPA_PM_THRESHOLD_MAX 5
		#define IPA_PM_EXCEPTION_MAX 2