From: Thierry Reding <treding@xxxxxxxxxx>
This enables the syscore callbacks to obtain the mbus context without
relying on a separate global variable.
Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
---
drivers/bus/mvebu-mbus.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 92daa45cc844..1f22bff0773c 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -130,6 +130,7 @@ struct mvebu_mbus_win_data {
};
struct mvebu_mbus_state {
+ struct syscore_ops syscore;
void __iomem *mbuswins_base;
void __iomem *sdramwins_base;
void __iomem *mbusbridge_base;
@@ -148,6 +149,12 @@ struct mvebu_mbus_state {
struct mvebu_mbus_win_data wins[MBUS_WINS_MAX];
};
+static inline struct mvebu_mbus_state *
+syscore_to_mbus(struct syscore_ops *ops)
+{
+ return container_of(ops, struct mvebu_mbus_state, syscore);
+}
+
static struct mvebu_mbus_state mbus_state;
/*
@@ -1008,7 +1015,7 @@ fs_initcall(mvebu_mbus_debugfs_init);
static int mvebu_mbus_suspend(struct syscore_ops *ops)
{
- struct mvebu_mbus_state *s = &mbus_state;
+ struct mvebu_mbus_state *s = syscore_to_mbus(ops);
int win;
if (!s->mbusbridge_base)
@@ -1042,7 +1049,7 @@ static int mvebu_mbus_suspend(struct syscore_ops *ops)
static void mvebu_mbus_resume(struct syscore_ops *ops)
{
- struct mvebu_mbus_state *s = &mbus_state;
+ struct mvebu_mbus_state *s = syscore_to_mbus(ops);
int win;
writel(s->mbus_bridge_ctrl,
@@ -1069,11 +1076,6 @@ static void mvebu_mbus_resume(struct syscore_ops *ops)
}
}
-static struct syscore_ops mvebu_mbus_syscore_ops = {
- .suspend = mvebu_mbus_suspend,
- .resume = mvebu_mbus_resume,
-};
-
static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
phys_addr_t mbuswins_phys_base,
size_t mbuswins_size,
@@ -1118,7 +1120,9 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
writel(UNIT_SYNC_BARRIER_ALL,
mbus->mbuswins_base + UNIT_SYNC_BARRIER_OFF);
- register_syscore_ops(&mvebu_mbus_syscore_ops);
+ mbus->syscore.suspend = mvebu_mbus_suspend;
+ mbus->syscore.resume = mvebu_mbus_resume;
+ register_syscore_ops(&mbus->syscore);
return 0;
}
--
2.48.1
