firmware: xilinx: Remove eemi ops for set_suspend_mode (951d0a97) · Commits · 戴 / test

drivers/firmware/xilinx/zynqmp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -724,10 +724,11 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_init_finalize);
		*
		* Return: Returns status, either success or error+reason
		*/
		static int zynqmp_pm_set_suspend_mode(u32 mode)
		int zynqmp_pm_set_suspend_mode(u32 mode)
		{
		return zynqmp_pm_invoke_fn(PM_SET_SUSPEND_MODE, mode, 0, 0, 0, NULL);
		}
		EXPORT_SYMBOL_GPL(zynqmp_pm_set_suspend_mode);

		/**
		* zynqmp_pm_request_node() - Request a node with specific capabilities
		@@ -809,7 +810,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
		}

		static const struct zynqmp_eemi_ops eemi_ops = {
		.set_suspend_mode = zynqmp_pm_set_suspend_mode,
		.request_node = zynqmp_pm_request_node,
		.release_node = zynqmp_pm_release_node,
		.set_requirement = zynqmp_pm_set_requirement,

+1 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ struct zynqmp_pm_work_struct {

		static struct zynqmp_pm_work_struct *zynqmp_pm_init_suspend_work;
		static struct mbox_chan *rx_chan;
		static const struct zynqmp_eemi_ops *eemi_ops;

		enum pm_suspend_mode {
		PM_SUSPEND_MODE_FIRST = 0,
		@@ -155,9 +154,6 @@ static ssize_t suspend_mode_store(struct device *dev,
		{
		int md, ret = -EINVAL;

		if (!eemi_ops->set_suspend_mode)
		return ret;

		for (md = PM_SUSPEND_MODE_FIRST; md < ARRAY_SIZE(suspend_modes); md++)
		if (suspend_modes[md] &&
		sysfs_streq(suspend_modes[md], buf)) {
		@@ -166,7 +162,7 @@ static ssize_t suspend_mode_store(struct device *dev,
		}

		if (!ret && md != suspend_mode) {
		ret = eemi_ops->set_suspend_mode(md);
		ret = zynqmp_pm_set_suspend_mode(md);
		if (likely(!ret))
		suspend_mode = md;
		}

+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 (*set_suspend_mode)(u32 mode);
		int (*request_node)(const u32 node,
		const u32 capabilities,
		const u32 qos,
		@@ -336,6 +335,7 @@ 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);
		int zynqmp_pm_set_suspend_mode(u32 mode);
		#else
		static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
		{
		@@ -428,6 +428,10 @@ static inline int zynqmp_pm_init_finalize(void)
		{
		return -ENODEV;
		}
		static inline int zynqmp_pm_set_suspend_mode(u32 mode)
		{
		return -ENODEV;
		}
		#endif

		#endif /* __FIRMWARE_ZYNQMP_H__ */