Commit 74858b63 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: get rid of empty IPA functions 



There are place holder functions in the IPA code that do nothing.
For the most part these are inverse functions, for example, once the
routing or filter tables are set up there is no need to perform any
matching teardown activity at shutdown, or in the case of an error.

These can be safely removed, resulting in some code simplification.
Add comments in these spots making it explicit that there is no
inverse.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 077e770f

drivers/net/ipa/ipa_main.c

+9 −20
Original line number Diff line number Diff line
@@ -147,13 +147,13 @@ int ipa_setup(struct ipa *ipa) 
	if (ret)

		goto err_endpoint_teardown;



	ret = ipa_mem_setup(ipa);

	ret = ipa_mem_setup(ipa);	/* No matching teardown required */

	if (ret)

		goto err_command_disable;



	ret = ipa_table_setup(ipa);

	ret = ipa_table_setup(ipa);	/* No matching teardown required */

	if (ret)

		goto err_mem_teardown;

		goto err_command_disable;



	/* Enable the exception handling endpoint, and tell the hardware

	 * to use it by default.
@@ -161,7 +161,7 @@ int ipa_setup(struct ipa *ipa) 
	exception_endpoint = ipa->name_map[IPA_ENDPOINT_AP_LAN_RX];

	ret = ipa_endpoint_enable_one(exception_endpoint);

	if (ret)

		goto err_table_teardown;

		goto err_command_disable;



	ipa_endpoint_default_route_set(ipa, exception_endpoint->endpoint_id);
@@ -179,10 +179,6 @@ int ipa_setup(struct ipa *ipa) 
err_default_route_clear:

	ipa_endpoint_default_route_clear(ipa);

	ipa_endpoint_disable_one(exception_endpoint);

err_table_teardown:

	ipa_table_teardown(ipa);

err_mem_teardown:

	ipa_mem_teardown(ipa);

err_command_disable:

	ipa_endpoint_disable_one(command_endpoint);

err_endpoint_teardown:
@@ -211,8 +207,6 @@ static void ipa_teardown(struct ipa *ipa) 
	ipa_endpoint_default_route_clear(ipa);

	exception_endpoint = ipa->name_map[IPA_ENDPOINT_AP_LAN_RX];

	ipa_endpoint_disable_one(exception_endpoint);

	ipa_table_teardown(ipa);

	ipa_mem_teardown(ipa);

	command_endpoint = ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX];

	ipa_endpoint_disable_one(command_endpoint);

	ipa_endpoint_teardown(ipa);
@@ -480,23 +474,20 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data) 
	if (ret)

		goto err_endpoint_deconfig;



	ipa_table_config(ipa);

	ipa_table_config(ipa);		/* No deconfig required */



	/* Assign resource limitation to each group */

	/* Assign resource limitation to each group; no deconfig required */

	ret = ipa_resource_config(ipa, data->resource_data);

	if (ret)

		goto err_table_deconfig;

		goto err_mem_deconfig;



	ret = ipa_modem_config(ipa);

	if (ret)

		goto err_resource_deconfig;

		goto err_mem_deconfig;



	return 0;



err_resource_deconfig:

	ipa_resource_deconfig(ipa);

err_table_deconfig:

	ipa_table_deconfig(ipa);

err_mem_deconfig:

	ipa_mem_deconfig(ipa);

err_endpoint_deconfig:

	ipa_endpoint_deconfig(ipa);
@@ -514,8 +505,6 @@ static int ipa_config(struct ipa *ipa, const struct ipa_data *data) 
static void ipa_deconfig(struct ipa *ipa)

{

	ipa_modem_deconfig(ipa);

	ipa_resource_deconfig(ipa);

	ipa_table_deconfig(ipa);

	ipa_mem_deconfig(ipa);

	ipa_endpoint_deconfig(ipa);

	ipa_hardware_deconfig(ipa);

drivers/net/ipa/ipa_mem.c

+3 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2019-2020 Linaro Ltd.

 * Copyright (C) 2019-2021 Linaro Ltd.

 */



#include <linux/types.h>
@@ -53,6 +53,8 @@ ipa_mem_zero_region_add(struct gsi_trans *trans, const struct ipa_mem *mem) 
 * The AP informs the modem where its portions of memory are located

 * in a QMI exchange that occurs at modem startup.

 *

 * There is no need for a matching ipa_mem_teardown() function.

 *

 * Return:	0 if successful, or a negative error code

 */

int ipa_mem_setup(struct ipa *ipa)
@@ -97,11 +99,6 @@ int ipa_mem_setup(struct ipa *ipa) 
	return 0;

}



void ipa_mem_teardown(struct ipa *ipa)

{

	/* Nothing to do */

}



#ifdef IPA_VALIDATE



static bool ipa_mem_valid(struct ipa *ipa, enum ipa_mem_id mem_id)

drivers/net/ipa/ipa_mem.h

+2 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (C) 2019-2020 Linaro Ltd.

 * Copyright (C) 2019-2021 Linaro Ltd.

 */

#ifndef _IPA_MEM_H_

#define _IPA_MEM_H_
@@ -88,8 +88,7 @@ struct ipa_mem { 
int ipa_mem_config(struct ipa *ipa);

void ipa_mem_deconfig(struct ipa *ipa);



int ipa_mem_setup(struct ipa *ipa);

void ipa_mem_teardown(struct ipa *ipa);

int ipa_mem_setup(struct ipa *ipa);	/* No ipa_mem_teardown() needed */



int ipa_mem_zero_modem(struct ipa *ipa);

drivers/net/ipa/ipa_resource.c

+1 −7
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static void ipa_resource_config_dst(struct ipa *ipa, u32 resource_type, 
	ipa_resource_config_common(ipa, offset, &resource->limits[6], ylimits);

}



/* Configure resources */

/* Configure resources; there is no ipa_resource_deconfig() */

int ipa_resource_config(struct ipa *ipa, const struct ipa_resource_data *data)

{

	u32 i;
@@ -174,9 +174,3 @@ int ipa_resource_config(struct ipa *ipa, const struct ipa_resource_data *data) 


	return 0;

}
 


/* Inverse of ipa_resource_config() */

void ipa_resource_deconfig(struct ipa *ipa)

{

	/* Nothing to do */

}

drivers/net/ipa/ipa_resource.h

+2 −6
Original line number Diff line number Diff line
@@ -14,14 +14,10 @@ struct ipa_resource_data; 
 * @ipa:	IPA pointer

 * @data:	IPA resource configuration data

 *

 * There is no need for a matching ipa_resource_deconfig() function.

 *

 * Return:	true if all regions are valid, false otherwise

 */

int ipa_resource_config(struct ipa *ipa, const struct ipa_resource_data *data);



/**

 * ipa_resource_deconfig() - Inverse of ipa_resource_config()

 * @ipa:	IPA pointer

 */

void ipa_resource_deconfig(struct ipa *ipa);



#endif /* _IPA_RESOURCE_H_ */