UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

memory: renesas-rpc-if: Remove Runtime PM wrappers 

Now the rpcif_{en,dis}able_rpm() wrappers just take a pointer to a
device structure, there is no point in keeping them.  Remove them, and
update the callers to call Runtime PM directly.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/d87aa5d7e4a39b18f7e2e0649fee0a45b45d371f.1669213027.git.geert+renesas@glider.be
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2022-11-23 15:41:22 +01:00 committed by Krzysztof Kozlowski
parent a198fcd1d5
commit 27e5f98c30
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/hyperbus/rpc-if.c
View File

@ -130,7 +130,7 @@ static int rpcif_hb_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, hyperbus); platform_set_drvdata(pdev, hyperbus);
rpcif_enable_rpm(hyperbus->rpc.dev); pm_runtime_enable(hyperbus->rpc.dev);
error = rpcif_hw_init(hyperbus->rpc.dev, true); error = rpcif_hw_init(hyperbus->rpc.dev, true);
if (error) if (error)
@ -150,7 +150,7 @@ static int rpcif_hb_probe(struct platform_device *pdev)
return 0; return 0;
out_disable_rpm: out_disable_rpm:
rpcif_disable_rpm(hyperbus->rpc.dev); pm_runtime_disable(hyperbus->rpc.dev);
return error; return error;
} }
@ -160,7 +160,7 @@ static int rpcif_hb_remove(struct platform_device *pdev)
hyperbus_unregister_device(&hyperbus->hbdev); hyperbus_unregister_device(&hyperbus->hbdev);
rpcif_disable_rpm(hyperbus->rpc.dev); pm_runtime_disable(hyperbus->rpc.dev);
return 0; return 0;
} }

6
drivers/spi/spi-rpc-if.c
View File

@ -147,7 +147,7 @@ static int rpcif_spi_probe(struct platform_device *pdev)
ctlr->dev.of_node = parent->of_node; ctlr->dev.of_node = parent->of_node;
rpcif_enable_rpm(rpc->dev); pm_runtime_enable(rpc->dev);
ctlr->num_chipselect = 1; ctlr->num_chipselect = 1;
ctlr->mem_ops = &rpcif_spi_mem_ops; ctlr->mem_ops = &rpcif_spi_mem_ops;
@ -169,7 +169,7 @@ static int rpcif_spi_probe(struct platform_device *pdev)
return 0; return 0;
out_disable_rpm: out_disable_rpm:
rpcif_disable_rpm(rpc->dev); pm_runtime_disable(rpc->dev);
return error; return error;
} }
@ -179,7 +179,7 @@ static int rpcif_spi_remove(struct platform_device *pdev)
struct rpcif *rpc = spi_controller_get_devdata(ctlr); struct rpcif *rpc = spi_controller_get_devdata(ctlr);
spi_unregister_controller(ctlr); spi_unregister_controller(ctlr);
rpcif_disable_rpm(rpc->dev); pm_runtime_disable(rpc->dev);
return 0; return 0;
} }

10
include/memory/renesas-rpc-if.h
View File

@ -76,14 +76,4 @@ void rpcif_prepare(struct device *dev, const struct rpcif_op *op, u64 *offs,
int rpcif_manual_xfer(struct device *dev); int rpcif_manual_xfer(struct device *dev);
ssize_t rpcif_dirmap_read(struct device *dev, u64 offs, size_t len, void *buf); ssize_t rpcif_dirmap_read(struct device *dev, u64 offs, size_t len, void *buf);
static inline void rpcif_enable_rpm(struct device *dev)
{
pm_runtime_enable(dev);
}
static inline void rpcif_disable_rpm(struct device *dev)
{
pm_runtime_disable(dev);
}
#endif // __RENESAS_RPC_IF_H #endif // __RENESAS_RPC_IF_H