Commit 07fb1a46 authored by Rajan Vaja's avatar Rajan Vaja Committed by Greg Kroah-Hartman

firmware: xilinx: Remove eemi ops for release_node

Use direct function call instead of using eemi ops for release_node.
Signed-off-by: default avatarRajan Vaja <rajan.vaja@xilinx.com>
Signed-off-by: default avatarJolly Shah <jolly.shah@xilinx.com>
Link: https://lore.kernel.org/r/1587761887-4279-18-git-send-email-jolly.shah@xilinx.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf8b27ed
...@@ -760,10 +760,11 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_request_node); ...@@ -760,10 +760,11 @@ EXPORT_SYMBOL_GPL(zynqmp_pm_request_node);
* *
* Return: Returns status, either success or error+reason * Return: Returns status, either success or error+reason
*/ */
static int zynqmp_pm_release_node(const u32 node) int zynqmp_pm_release_node(const u32 node)
{ {
return zynqmp_pm_invoke_fn(PM_RELEASE_NODE, node, 0, 0, 0, NULL); return zynqmp_pm_invoke_fn(PM_RELEASE_NODE, node, 0, 0, 0, NULL);
} }
EXPORT_SYMBOL_GPL(zynqmp_pm_release_node);
/** /**
* zynqmp_pm_set_requirement() - PM call to set requirement for PM slaves * zynqmp_pm_set_requirement() - PM call to set requirement for PM slaves
...@@ -810,7 +811,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out) ...@@ -810,7 +811,6 @@ static int zynqmp_pm_aes_engine(const u64 address, u32 *out)
} }
static const struct zynqmp_eemi_ops eemi_ops = { static const struct zynqmp_eemi_ops eemi_ops = {
.release_node = zynqmp_pm_release_node,
.set_requirement = zynqmp_pm_set_requirement, .set_requirement = zynqmp_pm_set_requirement,
.fpga_load = zynqmp_pm_fpga_load, .fpga_load = zynqmp_pm_fpga_load,
.fpga_get_status = zynqmp_pm_fpga_get_status, .fpga_get_status = zynqmp_pm_fpga_get_status,
......
...@@ -196,16 +196,13 @@ static void zynqmp_gpd_detach_dev(struct generic_pm_domain *domain, ...@@ -196,16 +196,13 @@ static void zynqmp_gpd_detach_dev(struct generic_pm_domain *domain,
int ret; int ret;
struct zynqmp_pm_domain *pd; struct zynqmp_pm_domain *pd;
if (!eemi_ops->release_node)
return;
pd = container_of(domain, struct zynqmp_pm_domain, gpd); pd = container_of(domain, struct zynqmp_pm_domain, gpd);
/* If this is not the last device to detach there is nothing to do */ /* If this is not the last device to detach there is nothing to do */
if (domain->device_count) if (domain->device_count)
return; return;
ret = eemi_ops->release_node(pd->node_id); ret = zynqmp_pm_release_node(pd->node_id);
/* If releasing a node fails print the error and return */ /* If releasing a node fails print the error and return */
if (ret) { if (ret) {
pr_err("%s() %s release failed for node %d: %d\n", pr_err("%s() %s release failed for node %d: %d\n",
......
...@@ -296,7 +296,6 @@ struct zynqmp_pm_query_data { ...@@ -296,7 +296,6 @@ struct zynqmp_pm_query_data {
struct zynqmp_eemi_ops { struct zynqmp_eemi_ops {
int (*fpga_load)(const u64 address, const u32 size, const u32 flags); int (*fpga_load)(const u64 address, const u32 size, const u32 flags);
int (*fpga_get_status)(u32 *value); int (*fpga_get_status)(u32 *value);
int (*release_node)(const u32 node);
int (*set_requirement)(const u32 node, int (*set_requirement)(const u32 node,
const u32 capabilities, const u32 capabilities,
const u32 qos, const u32 qos,
...@@ -334,6 +333,7 @@ int zynqmp_pm_init_finalize(void); ...@@ -334,6 +333,7 @@ int zynqmp_pm_init_finalize(void);
int zynqmp_pm_set_suspend_mode(u32 mode); int zynqmp_pm_set_suspend_mode(u32 mode);
int zynqmp_pm_request_node(const u32 node, const u32 capabilities, int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
const u32 qos, const enum zynqmp_pm_request_ack ack); const u32 qos, const enum zynqmp_pm_request_ack ack);
int zynqmp_pm_release_node(const u32 node);
#else #else
static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
{ {
...@@ -436,6 +436,10 @@ static inline int zynqmp_pm_request_node(const u32 node, const u32 capabilities, ...@@ -436,6 +436,10 @@ static inline int zynqmp_pm_request_node(const u32 node, const u32 capabilities,
{ {
return -ENODEV; return -ENODEV;
} }
static inline int zynqmp_pm_release_node(const u32 node)
{
return -ENODEV;
}
#endif #endif
#endif /* __FIRMWARE_ZYNQMP_H__ */ #endif /* __FIRMWARE_ZYNQMP_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment