From: Thierry Reding <[email protected]> Pass the driver-specific data via the syscore struct and use it in the syscore ops.
Signed-off-by: Thierry Reding <[email protected]> --- Changes in v3: - adjust for API changes and update commit message drivers/bus/mvebu-mbus.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index dd94145c9b22..d33c8e42e91c 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 syscore; void __iomem *mbuswins_base; void __iomem *sdramwins_base; void __iomem *mbusbridge_base; @@ -1008,7 +1009,7 @@ fs_initcall(mvebu_mbus_debugfs_init); static int mvebu_mbus_suspend(void *data) { - struct mvebu_mbus_state *s = &mbus_state; + struct mvebu_mbus_state *s = data; int win; if (!s->mbusbridge_base) @@ -1042,7 +1043,7 @@ static int mvebu_mbus_suspend(void *data) static void mvebu_mbus_resume(void *data) { - struct mvebu_mbus_state *s = &mbus_state; + struct mvebu_mbus_state *s = data; int win; writel(s->mbus_bridge_ctrl, @@ -1074,10 +1075,6 @@ static const struct syscore_ops mvebu_mbus_syscore_ops = { .resume = mvebu_mbus_resume, }; -static struct syscore mvebu_mbus_syscore = { - .ops = &mvebu_mbus_syscore_ops, -}; - static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus, phys_addr_t mbuswins_phys_base, size_t mbuswins_size, @@ -1122,7 +1119,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(&mvebu_mbus_syscore); + mbus->syscore.ops = &mvebu_mbus_syscore_ops; + mbus->syscore.data = mbus; + register_syscore(&mbus->syscore); return 0; } -- 2.51.0
