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

Commit 0f02818b 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: compilation errors fix"

parents cb1b4efc 37cbf6be

drivers/platform/msm/ipa/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_IPA) += ipa_v2/ ipa_clients/ ipa_common

obj-$(CONFIG_IPA3) += ipa_v3/ ipa_clients/ ipa_common

obj-$(CONFIG_IPA_UT) += test/

drivers/platform/msm/ipa/ipa_api.c

+0 −7
Original line number Diff line number Diff line
@@ -2655,13 +2655,6 @@ static int ipa_generic_plat_drv_probe(struct platform_device *pdev_p) 


	/* call probe based on IPA HW version */

	switch (ipa_api_hw_type) {

	case IPA_HW_v2_0:

	case IPA_HW_v2_1:

	case IPA_HW_v2_5:

	case IPA_HW_v2_6L:

		result = ipa_plat_drv_probe(pdev_p, ipa_api_ctrl,

			ipa_plat_drv_match);

		break;

	case IPA_HW_v3_0:

	case IPA_HW_v3_1:

	case IPA_HW_v3_5:

drivers/platform/msm/ipa/ipa_api.h

+0 −13
Original line number Diff line number Diff line
@@ -382,19 +382,6 @@ struct ipa_api_controller { 
	void (*ipa_ntn_uc_dereg_rdyCB)(void);

};



#ifdef CONFIG_IPA

int ipa_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,

	const struct of_device_id *pdrv_match);

#else

static inline int ipa_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,

	const struct of_device_id *pdrv_match)

{

	return -ENODEV;

}

#endif /* (CONFIG_IPA) */



#ifdef CONFIG_IPA3

int ipa3_plat_drv_probe(struct platform_device *pdev_p,

	struct ipa_api_controller *api_ctrl,