firmware: xilinx: Remove eemi ops for reset_get_status (1b413581) · Commits · 戴 / test

drivers/firmware/xilinx/zynqmp.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -642,8 +642,7 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_reset_assert);
		*
		* Return: Returns status, either success or error+reason
		*/
		static int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset,
		u32 *status)
		int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset, u32 *status)
		{
		u32 ret_payload[PAYLOAD_ARG_CNT];
		int ret;
		@@ -657,6 +656,7 @@ static int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset,

		return ret;
		}
		EXPORT_SYMBOL_GPL(zynqmp_pm_reset_get_status);

		/**
		* zynqmp_pm_fpga_load - Perform the fpga load
		@@ -808,7 +808,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
		}

		static const struct zynqmp_eemi_ops eemi_ops = {
		.reset_get_status = zynqmp_pm_reset_get_status,
		.init_finalize = zynqmp_pm_init_finalize,
		.set_suspend_mode = zynqmp_pm_set_suspend_mode,
		.request_node = zynqmp_pm_request_node,

+1 −7

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@

		struct zynqmp_reset_data {
		struct reset_controller_dev rcdev;
		const struct zynqmp_eemi_ops *eemi_ops;
		};

		static inline struct zynqmp_reset_data *
		@@ -41,10 +40,9 @@ static int zynqmp_reset_deassert(struct reset_controller_dev *rcdev,
		static int zynqmp_reset_status(struct reset_controller_dev *rcdev,
		unsigned long id)
		{
		struct zynqmp_reset_data *priv = to_zynqmp_reset_data(rcdev);
		int val, err;

		err = priv->eemi_ops->reset_get_status(ZYNQMP_RESET_ID + id, &val);
		err = zynqmp_pm_reset_get_status(ZYNQMP_RESET_ID + id, &val);
		if (err)
		return err;

		@@ -73,10 +71,6 @@ static int zynqmp_reset_probe(struct platform_device *pdev)
		if (!priv)
		return -ENOMEM;

		priv->eemi_ops = zynqmp_pm_get_eemi_ops();
		if (IS_ERR(priv->eemi_ops))
		return PTR_ERR(priv->eemi_ops);

		platform_set_drvdata(pdev, priv);

		priv->rcdev.ops = &zynqmp_reset_ops;

+6 −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 (reset_get_status)(const enum zynqmp_pm_reset reset, u32 status);
		int (*init_finalize)(void);
		int (*set_suspend_mode)(u32 mode);
		int (*request_node)(const u32 node,
		@@ -336,6 +335,7 @@ int zynqmp_pm_set_sd_tapdelay(u32 node_id, u32 type, u32 value);
		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);
		#else
		static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
		{
		@@ -419,6 +419,11 @@ static inline int zynqmp_pm_reset_assert(const enum zynqmp_pm_reset reset,
		{
		return -ENODEV;
		}
		static inline int zynqmp_pm_reset_get_status(const enum zynqmp_pm_reset reset,
		u32 *status)
		{
		return -ENODEV;
		}
		#endif

		#endif /* __FIRMWARE_ZYNQMP_H__ */