firmware: xilinx: Remove eemi ops for request_node (bf8b27ed) · Commits · 戴 / test

drivers/firmware/xilinx/zynqmp.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -742,13 +742,13 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_set_suspend_mode);
		*
		* Return: Returns status, either success or error+reason
		*/
		static int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
		const u32 qos,
		const enum zynqmp_pm_request_ack ack)
		int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
		const u32 qos, const enum zynqmp_pm_request_ack ack)
		{
		return zynqmp_pm_invoke_fn(PM_REQUEST_NODE, node, capabilities,
		qos, ack, NULL);
		}
		EXPORT_SYMBOL_GPL(zynqmp_pm_request_node);

		/**
		* zynqmp_pm_release_node() - Release a node
		@@ -810,7 +810,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
		}

		static const struct zynqmp_eemi_ops eemi_ops = {
		.request_node = zynqmp_pm_request_node,
		.release_node = zynqmp_pm_release_node,
		.set_requirement = zynqmp_pm_set_requirement,
		.fpga_load = zynqmp_pm_fpga_load,

+1 −4

Original line number	Diff line number	Diff line
		@@ -163,16 +163,13 @@ static int zynqmp_gpd_attach_dev(struct generic_pm_domain *domain,
		int ret;
		struct zynqmp_pm_domain *pd;

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

		pd = container_of(domain, struct zynqmp_pm_domain, gpd);

		/* If this is not the first device to attach there is nothing to do */
		if (domain->device_count)
		return 0;

		ret = eemi_ops->request_node(pd->node_id, 0, 0,
		ret = zynqmp_pm_request_node(pd->node_id, 0, 0,
		ZYNQMP_PM_REQUEST_ACK_BLOCKING);
		/* If requesting a node fails print and return the error */
		if (ret) {

+8 −4

Original line number	Diff line number	Diff line
		@@ -296,10 +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 (*request_node)(const u32 node,
		const u32 capabilities,
		const u32 qos,
		const enum zynqmp_pm_request_ack ack);
		int (*release_node)(const u32 node);
		int (*set_requirement)(const u32 node,
		const u32 capabilities,
		@@ -336,6 +332,8 @@ int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
		int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset, u32 *status);
		int zynqmp_pm_init_finalize(void);
		int zynqmp_pm_set_suspend_mode(u32 mode);
		int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
		const u32 qos, const enum zynqmp_pm_request_ack ack);
		#else
		static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
		{
		@@ -432,6 +430,12 @@ static inline int zynqmp_pm_set_suspend_mode(u32 mode)
		{
		return -ENODEV;
		}
		static inline int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
		const u32 qos,
		const enum zynqmp_pm_request_ack ack)
		{
		return -ENODEV;
		}
		#endif

		#endif /* __FIRMWARE_ZYNQMP_H__ */