firmware: xilinx: Remove eemi ops for init_finalize (9474da95) · Commits · 戴 / test

drivers/firmware/xilinx/zynqmp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -710,10 +710,11 @@ static int zynqmp_pm_fpga_get_status(u32 *value)
		*
		* Return: Returns status, either success or error+reason
		*/
		static int zynqmp_pm_init_finalize(void)
		int zynqmp_pm_init_finalize(void)
		{
		return zynqmp_pm_invoke_fn(PM_PM_INIT_FINALIZE, 0, 0, 0, 0, NULL);
		}
		EXPORT_SYMBOL_GPL(zynqmp_pm_init_finalize);

		/**
		* zynqmp_pm_set_suspend_mode() - Set system suspend mode
		@@ -808,7 +809,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
		}

		static const struct zynqmp_eemi_ops eemi_ops = {
		.init_finalize = zynqmp_pm_init_finalize,
		.set_suspend_mode = zynqmp_pm_set_suspend_mode,
		.request_node = zynqmp_pm_request_node,
		.release_node = zynqmp_pm_release_node,

+1 −8

Original line number	Diff line number	Diff line
		@@ -182,14 +182,7 @@ static int zynqmp_pm_probe(struct platform_device *pdev)
		u32 pm_api_version;
		struct mbox_client *client;

		eemi_ops = zynqmp_pm_get_eemi_ops();
		if (IS_ERR(eemi_ops))
		return PTR_ERR(eemi_ops);

		if (!eemi_ops->init_finalize)
		return -ENXIO;

		eemi_ops->init_finalize();
		zynqmp_pm_init_finalize();
		zynqmp_pm_get_api_version(&pm_api_version);

		/* Check PM API version number */

+5 −1

Original line number	Diff line number	Diff line
		@@ -296,7 +296,6 @@ struct zynqmp_pm_query_data {
		struct zynqmp_eemi_ops {
		int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
		int (fpga_get_status)(u32 value);
		int (*init_finalize)(void);
		int (*set_suspend_mode)(u32 mode);
		int (*request_node)(const u32 node,
		const u32 capabilities,
		@@ -336,6 +335,7 @@ int zynqmp_pm_sd_dll_reset(u32 node_id, u32 type);
		int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
		const enum zynqmp_pm_reset_action assert_flag);
		int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset, u32 *status);
		int zynqmp_pm_init_finalize(void);
		#else
		static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
		{
		@@ -424,6 +424,10 @@ static inline int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset,
		{
		return -ENODEV;
		}
		static inline int zynqmp_pm_init_finalize(void)
		{
		return -ENODEV;
		}
		#endif

		#endif /* __FIRMWARE_ZYNQMP_H__ */